From 6275c6eef76b03bb78a393e593080eabde3abf95 Mon Sep 17 00:00:00 2001 From: Gokula Krishna Date: Tue, 24 Jul 2018 11:12:17 +0800 Subject: [PATCH 1/4] Change XML attribute for procedure from varId to var-id --- blocks/procedures.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blocks/procedures.js b/blocks/procedures.js index 196205ce4..b424823ed 100644 --- a/blocks/procedures.js +++ b/blocks/procedures.js @@ -132,6 +132,7 @@ Blockly.Blocks['procedures_defnoreturn'] = { var argModel = this.argumentVarModels_[i]; parameter.setAttribute('name', argModel.name); parameter.setAttribute('varId', argModel.getId()); + parameter.setAttribute('var-id', argModel.getId()); if (opt_paramIds && this.paramIds_) { parameter.setAttribute('paramId', this.paramIds_[i]); } @@ -155,7 +156,7 @@ Blockly.Blocks['procedures_defnoreturn'] = { for (var i = 0, childNode; childNode = xmlElement.childNodes[i]; i++) { if (childNode.nodeName.toLowerCase() == 'arg') { var varName = childNode.getAttribute('name'); - var varId = childNode.getAttribute('varId'); + var varId = childNode.getAttribute('varId') || childNode.getAttribute('var-id'); this.arguments_.push(varName); var variable = Blockly.Variables.getOrCreateVariablePackage( this.workspace, varId, varName, ''); From 97d3956c43c471009191b93aca80081a5d4a9fdd Mon Sep 17 00:00:00 2001 From: Gokula Krishna Date: Tue, 24 Jul 2018 13:31:04 +0800 Subject: [PATCH 2/4] Prioritize current key var-id --- blocks/procedures.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blocks/procedures.js b/blocks/procedures.js index b424823ed..7fe563e21 100644 --- a/blocks/procedures.js +++ b/blocks/procedures.js @@ -156,7 +156,7 @@ Blockly.Blocks['procedures_defnoreturn'] = { for (var i = 0, childNode; childNode = xmlElement.childNodes[i]; i++) { if (childNode.nodeName.toLowerCase() == 'arg') { var varName = childNode.getAttribute('name'); - var varId = childNode.getAttribute('varId') || childNode.getAttribute('var-id'); + var varId = childNode.getAttribute('var-id') || childNode.getAttribute('varId'); this.arguments_.push(varName); var variable = Blockly.Variables.getOrCreateVariablePackage( this.workspace, varId, varName, ''); From 2c3ef6460944322f4a30fd46bbfb31f8f687d2c8 Mon Sep 17 00:00:00 2001 From: Gokula Krishna Date: Tue, 24 Jul 2018 17:29:35 +0800 Subject: [PATCH 3/4] Remove varId attribute while saving --- blocks/procedures.js | 1 - 1 file changed, 1 deletion(-) diff --git a/blocks/procedures.js b/blocks/procedures.js index 7fe563e21..a1db16baa 100644 --- a/blocks/procedures.js +++ b/blocks/procedures.js @@ -131,7 +131,6 @@ Blockly.Blocks['procedures_defnoreturn'] = { var parameter = document.createElement('arg'); var argModel = this.argumentVarModels_[i]; parameter.setAttribute('name', argModel.name); - parameter.setAttribute('varId', argModel.getId()); parameter.setAttribute('var-id', argModel.getId()); if (opt_paramIds && this.paramIds_) { parameter.setAttribute('paramId', this.paramIds_[i]); From eef7e8f923d5a5b2dbb7e72277802893b1ca5eb4 Mon Sep 17 00:00:00 2001 From: Gokula Krishna Date: Wed, 25 Jul 2018 10:56:22 +0800 Subject: [PATCH 4/4] Change the XML attribute key from var-id to varid --- blocks/procedures.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/blocks/procedures.js b/blocks/procedures.js index a1db16baa..3019b0b9c 100644 --- a/blocks/procedures.js +++ b/blocks/procedures.js @@ -131,7 +131,7 @@ Blockly.Blocks['procedures_defnoreturn'] = { var parameter = document.createElement('arg'); var argModel = this.argumentVarModels_[i]; parameter.setAttribute('name', argModel.name); - parameter.setAttribute('var-id', argModel.getId()); + parameter.setAttribute('varid', argModel.getId()); if (opt_paramIds && this.paramIds_) { parameter.setAttribute('paramId', this.paramIds_[i]); } @@ -155,7 +155,7 @@ Blockly.Blocks['procedures_defnoreturn'] = { for (var i = 0, childNode; childNode = xmlElement.childNodes[i]; i++) { if (childNode.nodeName.toLowerCase() == 'arg') { var varName = childNode.getAttribute('name'); - var varId = childNode.getAttribute('var-id') || childNode.getAttribute('varId'); + var varId = childNode.getAttribute('varid') || childNode.getAttribute('varId'); this.arguments_.push(varName); var variable = Blockly.Variables.getOrCreateVariablePackage( this.workspace, varId, varName, '');