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

Fix 11 warnings related to variables and variable_model. (#3278)

Browse Source 
* Fix 10 warnings related to variables and variable_model.
This commit is contained in:
Sam El-Husseini
2019-10-22 14:26:59 -04:00
committed by GitHub
parent 270781113d
commit 90ad0789f6
5 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/variable_map.js
View File

@@ -168,7 +168,7 @@ Blockly.VariableMap.prototype.renameVariableWithConflict_ = function(variable,
* their type. This will default to '' which is a specific type.
* @param {?string=} opt_id The unique ID of the variable. This will default to
* a UUID.
* @return {Blockly.VariableModel} The newly created variable.
* @return {!Blockly.VariableModel} The newly created variable.
*/
Blockly.VariableMap.prototype.createVariable = function(name,
opt_type, opt_id) {
@@ -248,13 +248,13 @@ Blockly.VariableMap.prototype.deleteVariableById = function(id) {
replace('%2', variableName);
Blockly.confirm(confirmText,
function(ok) {
if (ok) {
map.deleteVariableInternal_(variable, uses);
if (ok && variable) {
map.deleteVariableInternal(variable, uses);
}
});
} else {
// No confirmation necessary for a single block.
map.deleteVariableInternal_(variable, uses);
map.deleteVariableInternal(variable, uses);
}
} else {
console.warn("Can't delete non-existent variable: " + id);
@@ -266,9 +266,9 @@ Blockly.VariableMap.prototype.deleteVariableById = function(id) {
* user for confirmation.
* @param {!Blockly.VariableModel} variable Variable to delete.
* @param {!Array.<!Blockly.Block>} uses An array of uses of the variable.
* @private
* @package
*/
Blockly.VariableMap.prototype.deleteVariableInternal_ = function(variable,
Blockly.VariableMap.prototype.deleteVariableInternal = function(variable,
uses) {
var existingGroup = Blockly.Events.getGroup();
if (!existingGroup) {
@@ -292,7 +292,7 @@ Blockly.VariableMap.prototype.deleteVariableInternal_ = function(variable,
* Find the variable by the given name and type and return it. Return null if
* it is not found.
* @param {string} name The name to check for.
* @param {string=} opt_type The type of the variable. If not provided it
* @param {?string=} opt_type The type of the variable. If not provided it
* defaults to the empty string, which is a specific type.
* @return {Blockly.VariableModel} The variable with the given name, or null if
* it was not found.