From d33567ffe53567352496055dc521102101ec79bd Mon Sep 17 00:00:00 2001 From: ignatandrei Date: Sun, 24 May 2020 18:28:00 +0300 Subject: [PATCH] refactor --- .../TestBlocklyHtml/wwwroot/blockly.html | 123 +----------------- .../blockly/converters/convertJSONString.js | 37 ++++++ .../wwwroot/blockly/objects/propJS.js | 59 +++++++++ 3 files changed, 100 insertions(+), 119 deletions(-) create mode 100644 src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly/converters/convertJSONString.js create mode 100644 src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly/objects/propJS.js diff --git a/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly.html b/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly.html index e53f8cc..34b7216 100644 --- a/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly.html +++ b/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly.html @@ -21,12 +21,14 @@ + + @@ -890,115 +892,8 @@

localSiteDom.innerHTML = blockTextLocalSiteFunctions; - Blockly.Blocks['converttojson'] = { - init: function () { - this.appendDummyInput() - .appendField("ConvertToJSON"); - this.appendValueInput("ValueToConvert") - .setCheck(null); - this.setInputsInline(true); - this.setOutput(true, null); - this.setTooltip("Convert to JSON"); - this.setHelpUrl(""); - } - }; - - Blockly.Blocks['converttojson'] = { - init: function () { - this.appendDummyInput() - .appendField("ConvertToJSON"); - this.appendValueInput("ValueToConvert") - .setCheck(null); - this.setInputsInline(true); - this.setOutput(true, null); - this.setTooltip("Convert to JSON"); - this.setHelpUrl(""); - } - }; - Blockly.JavaScript['converttojson'] = function (block) { - var value_ValueToConvert = Blockly.JavaScript.valueToCode(block, 'ValueToConvert', Blockly.JavaScript.ORDER_ATOMIC); - //value_ValueToConvert = value_ValueToConvert.replace(/(\r\n|\n|\r)/gm, "") - const code = 'JSON.parse(' + value_ValueToConvert + ')'; - return [code, Blockly.JavaScript.ORDER_NONE]; - - }; - Blockly.Blocks['converttostring'] = { - init: function () { - this.appendDummyInput() - .appendField("ConvertToString"); - this.appendValueInput("ValueToConvert") - .setCheck(null); - this.setInputsInline(true); - this.setOutput(true, null); - this.setTooltip("Convert to String"); - this.setHelpUrl(""); - } - }; - Blockly.JavaScript['converttostring'] = function (block) { - var value_ValueToConvert = Blockly.JavaScript.valueToCode(block, 'ValueToConvert', Blockly.JavaScript.ORDER_ATOMIC); - var code = 'JSON.stringify(' + value_ValueToConvert + ')'; - return [code, Blockly.JavaScript.ORDER_NONE]; - }; - - //https://blockly-demo.appspot.com/static/demos/blockfactory/index.html#7jmg3m - Blockly.Blocks['modifyproperty'] = { - init: function () { - this.appendDummyInput() - .appendField("Modify "); - this.appendValueInput("ObjectToChange") - .setCheck(null) - .setAlign(Blockly.ALIGN_CENTRE) - .appendField(new Blockly.FieldLabelSerializable("object"), "objectName"); - this.appendValueInput("PropertyName") - .setCheck(null) - .setAlign(Blockly.ALIGN_RIGHT) - .appendField(new Blockly.FieldLabelSerializable(",property"), "prop"); - this.appendValueInput("NewValue") - .setCheck(null) - .setAlign(Blockly.ALIGN_RIGHT) - .appendField(new Blockly.FieldLabelSerializable("toValue"), "newValue"); - this.setInputsInline(true); - this.setPreviousStatement(true, null); - this.setNextStatement(true, null); - this.setTooltip(""); - this.setHelpUrl(""); - } - }; - Blockly.JavaScript['modifyproperty'] = function (block) { - var value_objecttochange = Blockly.JavaScript.valueToCode(block, 'ObjectToChange', Blockly.JavaScript.ORDER_ATOMIC); - var value_propertyname = Blockly.JavaScript.valueToCode(block, 'PropertyName', Blockly.JavaScript.ORDER_ATOMIC); - var value_newvalue = Blockly.JavaScript.valueToCode(block, 'NewValue', Blockly.JavaScript.ORDER_ATOMIC); - var code = value_objecttochange + "[" + value_propertyname + ']=' + value_newvalue + ";"; - return code; - }; - - Blockly.Blocks['getproperty'] = { - init: function () { - this.appendDummyInput() - .appendField("Get from"); - this.appendValueInput("ObjectToChange") - .setCheck(null) - .setAlign(Blockly.ALIGN_CENTRE) - .appendField(new Blockly.FieldLabelSerializable("object"), "objectName"); - this.appendValueInput("PropertyName") - .setCheck(null) - .setAlign(Blockly.ALIGN_RIGHT) - .appendField(new Blockly.FieldLabelSerializable("property"), "prop"); - this.setInputsInline(true); - this.setOutput(true, null) - //this.setTooltip(""); - //this.setHelpUrl(""); - } - - }; - Blockly.JavaScript['getproperty'] = function (block) { - var value_objecttochange = Blockly.JavaScript.valueToCode(block, 'ObjectToChange', Blockly.JavaScript.ORDER_ATOMIC); - var value_propertyname = Blockly.JavaScript.valueToCode(block, 'PropertyName', Blockly.JavaScript.ORDER_ATOMIC); - - var code = value_objecttochange + "[" + value_propertyname + ']'; - // TODO: Change ORDER_NONE to the correct strength. - return [code, Blockly.JavaScript.ORDER_NONE]; - }; + + //start swagger //window.alert(JSON.stringify(dictSwagger)); @@ -1071,16 +966,6 @@

workspaceSearch.init(); workspaceSearch.open(); registerSearch(demoWorkspace); - //demoWorkspace.registerToolboxCategoryCallback('LocalSiteFunctions', registerFunctions); - //function (ws) { - // //var tb = ws.getToolbox(); - // //console.log(tb); - // //window.alert('adsa'); - // registerFunctions(); - // //var tb = demoWorkspace.getToolbox(); - // //tb.refreshSelection(); - //}); - //start swagger diff --git a/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly/converters/convertJSONString.js b/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly/converters/convertJSONString.js new file mode 100644 index 0000000..d847374 --- /dev/null +++ b/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly/converters/convertJSONString.js @@ -0,0 +1,37 @@ + Blockly.Blocks['converttojson'] = { + init: function () { + this.appendDummyInput() + .appendField("ConvertToJSON"); + this.appendValueInput("ValueToConvert") + .setCheck(null); + this.setInputsInline(true); + this.setOutput(true, null); + this.setTooltip("Convert to JSON"); + this.setHelpUrl(""); + } + }; + Blockly.JavaScript['converttojson'] = function (block) { + var value_ValueToConvert = Blockly.JavaScript.valueToCode(block, 'ValueToConvert', Blockly.JavaScript.ORDER_ATOMIC); + //value_ValueToConvert = value_ValueToConvert.replace(/(\r\n|\n|\r)/gm, "") + const code = 'JSON.parse(' + value_ValueToConvert + ')'; + return [code, Blockly.JavaScript.ORDER_NONE]; + + }; + + Blockly.Blocks['converttostring'] = { + init: function () { + this.appendDummyInput() + .appendField("ConvertToString"); + this.appendValueInput("ValueToConvert") + .setCheck(null); + this.setInputsInline(true); + this.setOutput(true, null); + this.setTooltip("Convert to String"); + this.setHelpUrl(""); + } + }; + Blockly.JavaScript['converttostring'] = function (block) { + var value_ValueToConvert = Blockly.JavaScript.valueToCode(block, 'ValueToConvert', Blockly.JavaScript.ORDER_ATOMIC); + var code = 'JSON.stringify(' + value_ValueToConvert + ')'; + return [code, Blockly.JavaScript.ORDER_NONE]; + }; diff --git a/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly/objects/propJS.js b/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly/objects/propJS.js new file mode 100644 index 0000000..28710a5 --- /dev/null +++ b/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/blockly/objects/propJS.js @@ -0,0 +1,59 @@ +Blockly.Blocks['modifyproperty'] = { + init: function () { + this.appendDummyInput() + .appendField("Modify "); + this.appendValueInput("ObjectToChange") + .setCheck(null) + .setAlign(Blockly.ALIGN_CENTRE) + .appendField(new Blockly.FieldLabelSerializable("object"), "objectName"); + this.appendValueInput("PropertyName") + .setCheck(null) + .setAlign(Blockly.ALIGN_RIGHT) + .appendField(new Blockly.FieldLabelSerializable(",property"), "prop"); + this.appendValueInput("NewValue") + .setCheck(null) + .setAlign(Blockly.ALIGN_RIGHT) + .appendField(new Blockly.FieldLabelSerializable("toValue"), "newValue"); + this.setInputsInline(true); + this.setPreviousStatement(true, null); + this.setNextStatement(true, null); + this.setTooltip(""); + this.setHelpUrl(""); + } + }; + Blockly.JavaScript['modifyproperty'] = function (block) { + var value_objecttochange = Blockly.JavaScript.valueToCode(block, 'ObjectToChange', Blockly.JavaScript.ORDER_ATOMIC); + var value_propertyname = Blockly.JavaScript.valueToCode(block, 'PropertyName', Blockly.JavaScript.ORDER_ATOMIC); + var value_newvalue = Blockly.JavaScript.valueToCode(block, 'NewValue', Blockly.JavaScript.ORDER_ATOMIC); + var code = value_objecttochange + "[" + value_propertyname + ']=' + value_newvalue + ";"; + return code; + }; + Blockly.Blocks['getproperty'] = { + init: function () { + this.appendDummyInput() + .appendField("Get from"); + this.appendValueInput("ObjectToChange") + .setCheck(null) + .setAlign(Blockly.ALIGN_CENTRE) + .appendField(new Blockly.FieldLabelSerializable("object"), "objectName"); + this.appendValueInput("PropertyName") + .setCheck(null) + .setAlign(Blockly.ALIGN_RIGHT) + .appendField(new Blockly.FieldLabelSerializable("property"), "prop"); + this.setInputsInline(true); + this.setOutput(true, null) + //this.setTooltip(""); + //this.setHelpUrl(""); + } + + }; + Blockly.JavaScript['getproperty'] = function (block) { + var value_objecttochange = Blockly.JavaScript.valueToCode(block, 'ObjectToChange', Blockly.JavaScript.ORDER_ATOMIC); + var value_propertyname = Blockly.JavaScript.valueToCode(block, 'PropertyName', Blockly.JavaScript.ORDER_ATOMIC); + + var code = value_objecttochange + "[" + value_propertyname + ']'; + // TODO: Change ORDER_NONE to the correct strength. + return [code, Blockly.JavaScript.ORDER_NONE]; + }; + + \ No newline at end of file