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

Fixing the accessible variable stuff so it interacts correctly with (#1170)

Browse Source 
variableMap.
This commit is contained in:
CoryDCode
2017-06-13 09:47:27 -07:00
committed by GitHub
parent df84c71c66
commit 1ee550aa24
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
accessible/field-segment.component.js
View File

@@ -156,17 +156,16 @@ blocklyApp.FieldSegmentComponent = ng.core.Component({
},
// Confirm a selection for dropdown fields.
selectOption: function() {
if (this.optionValue != Blockly.Msg.RENAME_VARIABLE && this.optionValue !=
Blockly.Msg.DELETE_VARIABLE.replace('%1', this.mainField.getValue())) {
if (this.optionValue != Blockly.RENAME_VARIABLE_ID && this.optionValue !=
Blockly.DELETE_VARIABLE_ID) {
this.mainField.setValue(this.optionValue);
}
if (this.optionValue == Blockly.Msg.RENAME_VARIABLE) {
if (this.optionValue == Blockly.RENAME_VARIABLE_ID) {
this.variableModalService.showRenameModal_(this.mainField.getValue());
}
if (this.optionValue ==
Blockly.Msg.DELETE_VARIABLE.replace('%1', this.mainField.getValue())) {
if (this.optionValue == Blockly.DELETE_VARIABLE_ID) {
this.variableModalService.showRemoveModal_(this.mainField.getValue());
}
},

3
accessible/variable-modal.service.js
View File

@@ -71,7 +71,8 @@ blocklyApp.VariableModalService = ng.core.Class({
this.preRemoveShowHook(oldName, count);
this.modalIsShown = true;
} else {
blocklyApp.workspace.deleteVariableInternal_(oldName);
var variable = blocklyApp.workspace.getVariable(oldName);
blocklyApp.workspace.deleteVariableInternal_(variable);
}
},
getNumVariables: function(oldName) {

3
accessible/variable-remove-modal.component.js
View File

@@ -108,7 +108,8 @@ blocklyApp.VariableRemoveModalComponent = ng.core.Component({
},
// Submits the name change for the variable.
submit: function() {
blocklyApp.workspace.deleteVariableInternal_(this.currentVariableName);
var variable = blocklyApp.workspace.getVariable(this.currentVariableName);
blocklyApp.workspace.deleteVariableInternal_(variable);
this.hideModal_();
},
// Dismisses and closes the modal.

2
core/workspace.js
View File

@@ -326,7 +326,7 @@ Blockly.Workspace.prototype.getVariableUses = function(name) {
for (var j = 0; j < blockVariables.length; j++) {
var varName = blockVariables[j];
// Variable name may be null if the block is only half-built.
if (varName && Blockly.Names.equals(varName, name)) {
if (varName && name && Blockly.Names.equals(varName, name)) {
uses.push(blocks[i]);
}
}