CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-11 02:47:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix copyright ,quotes , comments , and optimize some flow.

Browse Source
This commit is contained in:
duzc2dtw@gmail.com
2017-12-05 11:14:45 +08:00
parent 4ce03b4799
commit cb380f9989
3 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
blocks/variables_dynamic.js
View File

@@ -2,7 +2,7 @@
* @license
* Visual Blocks Editor
*
* Copyright 2012 Google Inc.
* Copyright 2017 Google Inc.
* https://developers.google.com/blockly/
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -45,48 +45,48 @@ Blockly.Constants.VariablesDynamic.HUE = 310;
Blockly.defineBlocksWithJsonArray([ // BEGIN JSON EXTRACT
// Block for variable getter.
{
"type": "variables_get_dynamic",
"message0": "%1",
"args0": [{
"type": "field_variable",
"name": "VAR",
"variable": "%{BKY_VARIABLES_DEFAULT_NAME}"
'type': 'variables_get_dynamic',
'message0': '%1',
'args0': [{
'type': 'field_variable',
'name': 'VAR',
'variable': '%{BKY_VARIABLES_DEFAULT_NAME}'
}],
"output": null,
"colour": "%{BKY_VARIABLES_DYNAMIC_HUE}",
"helpUrl": "%{BKY_VARIABLES_GET_HELPURL}",
"tooltip": "%{BKY_VARIABLES_GET_TOOLTIP}",
"extensions": ["contextMenu_variableDynamicSetterGetter"],
"mutator":'contextMenu_variableDynamicMutation'
'output': null,
'colour': '%{BKY_VARIABLES_DYNAMIC_HUE}',
'helpUrl': '%{BKY_VARIABLES_GET_HELPURL}',
'tooltip': '%{BKY_VARIABLES_GET_TOOLTIP}',
'extensions': ['contextMenu_variableDynamicSetterGetter'],
'mutator':'contextMenu_variableDynamicMutation'
},
// Block for variable setter.
{
"type": "variables_set_dynamic",
"message0": "%{BKY_VARIABLES_SET}",
"args0": [{
"type": "field_variable",
"name": "VAR",
"variable": "%{BKY_VARIABLES_DEFAULT_NAME}"
'type': 'variables_set_dynamic',
'message0': '%{BKY_VARIABLES_SET}',
'args0': [{
'type': 'field_variable',
'name': 'VAR',
'variable': '%{BKY_VARIABLES_DEFAULT_NAME}'
},
{
"type": "input_value",
"name": "VALUE"
'type': 'input_value',
'name': 'VALUE'
}
],
"previousStatement": null,
"nextStatement": null,
"colour": "%{BKY_VARIABLES_DYNAMIC_HUE}",
"tooltip": "%{BKY_VARIABLES_SET_TOOLTIP}",
"helpUrl": "%{BKY_VARIABLES_SET_HELPURL}",
"extensions": ["contextMenu_variableDynamicSetterGetter"],
"mutator":'contextMenu_variableDynamicMutation'
'previousStatement': null,
'nextStatement': null,
'colour': '%{BKY_VARIABLES_DYNAMIC_HUE}',
'tooltip': '%{BKY_VARIABLES_SET_TOOLTIP}',
'helpUrl': '%{BKY_VARIABLES_SET_HELPURL}',
'extensions': ['contextMenu_variableDynamicSetterGetter'],
'mutator':'contextMenu_variableDynamicMutation'
}
]); // END JSON EXTRACT (Do not delete this comment.)
/**
* Mixin to add context menu items to create getter/setter blocks for this
* setter/getter.
* Used by blocks 'variables_set' and 'variables_get'.
* Used by blocks 'variables_set_dynamic' and 'variables_get_dynamic'.
* @mixin
* @augments Blockly.Block
* @package
@@ -128,11 +128,11 @@ Blockly.Constants.VariablesDynamic.CUSTOM_CONTEXT_MENU_VARIABLE_GETTER_SETTER_MI
onchange: function() {
var name = this.getFieldValue('VAR');
var variableModel = this.workspace.getVariable(name);
this.getField("VAR").variableTypes = [variableModel.type];
this.getField('VAR').variableTypes = [variableModel.type];
if (this.type == 'variables_get_dynamic') {
this.outputConnection.setCheck(variableModel.type);
} else {
this.getInput("VALUE").connection.setCheck(variableModel.type);
this.getInput('VALUE').connection.setCheck(variableModel.type);
}
}
};
@@ -150,7 +150,7 @@ Blockly.Constants.VariablesDynamic.CUSTOM_CONTEXT_MENU_VARIABLE_MUTATION = {
if (this.type == 'variables_get_dynamic') {
this.outputConnection.setCheck(variableModel.type);
} else {
this.getInput("VALUE").connection.setCheck(variableModel.type);
this.getInput('VALUE').connection.setCheck(variableModel.type);
}
return container;
},

2
core/constants.js
View File

@@ -247,7 +247,7 @@ Blockly.VARIABLE_CATEGORY_NAME = 'VARIABLE';
* variable blocks.
* @const {string}
*/
Blockly.VARIABLE_DYNAMIC_CATEGORY_NAME = 'VARIABLES_DYNAMIC';
Blockly.VARIABLE_DYNAMIC_CATEGORY_NAME = 'VARIABLE_DYNAMIC';
/**
* String for use in the "custom" attribute of a category in toolbox xml.

22
core/variables_dynamic.js
View File

@@ -2,7 +2,7 @@
* @license
* Visual Blocks Editor
*
* Copyright 2012 Google Inc.
* Copyright 2017 Google Inc.
* https://developers.google.com/blockly/
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -58,9 +58,9 @@ Blockly.VariablesDynamic.onCreateVariableButtonClick = function(button) {
Blockly.Variables.createVariable(button.getTargetWorkspace(), null, type);
}
});
// workspace.createVariable("abc", "string");
// workspace.createVariable("123", "number");
// workspace.createVariable("abcd", "string");
// workspace.createVariable('abc', 'string');
// workspace.createVariable('123', 'number');
// workspace.createVariable('abcd', 'string');
};
/**
* Construct the elements (blocks and button) required by the flyout for the
@@ -96,11 +96,11 @@ Blockly.VariablesDynamic.flyoutCategoryBlocks = function(workspace) {
if (variableModelList.length > 0) {
var varTypes = workspace.getVariableTypes();
for (var i in varTypes) {
var varType = varTypes[i];
var variableModelListOfType = workspace.getVariablesOfType(varType);
var firstVariable = variableModelListOfType[0];
if (Blockly.Blocks['variables_set_dynamic']) {
if (Blockly.Blocks['variables_set_dynamic']) {
for (var i in varTypes) {
var varType = varTypes[i];
var variableModelListOfType = workspace.getVariablesOfType(varType);
var firstVariable = variableModelListOfType[0];
var gap = i == varTypes.length - 1 ? 24 : 8;
var blockText = '<xml>' +
'<block type="variables_set_dynamic" gap="' + gap + '">' +
@@ -111,8 +111,8 @@ Blockly.VariablesDynamic.flyoutCategoryBlocks = function(workspace) {
xmlList.push(block);
}
}
for (var i = 0, variable; variable = variableModelList[i]; i++) {
if (Blockly.Blocks['variables_get_dynamic']) {
if (Blockly.Blocks['variables_get_dynamic']) {
for (var i = 0, variable; variable = variableModelList[i]; i++) {
var blockText = '<xml>' +
'<block type="variables_get_dynamic" gap="8">' +
Blockly.Variables.generateVariableFieldXml_(variable) +