panweitong 4 years ago
parent
commit
86715eccad

+ 1 - 1
blockly/blocks/arduino/led.js

@@ -133,7 +133,7 @@ Blockly.Blocks['led_drawpixel'] = {
     init: function() {
         this.appendDummyInput()
             .appendField(
-                new Blockly.FieldImage("./../blockly/media/pixel.png", 25, 25, "15"));
+                new Blockly.FieldImage("./blockly/media/pixel.png", 25, 25, "15"));
         this.appendDummyInput()
             .appendField(Blockly.Msg.LED_DRAW + Blockly.Msg.LED_PIXEL);
         this.appendValueInput("COLOR")

+ 1 - 1
blockly/blocks/python/iot.js

@@ -156,7 +156,7 @@ Blockly.Blocks['iot_lcd_drawpixel'] = {
     init: function () {
         this.appendDummyInput()
             .appendField(
-                new Blockly.FieldImage("./../blockly/media/pixel.png", 25, 25, "15"));
+                new Blockly.FieldImage("./blockly/media/pixel.png", 25, 25, "15"));
         this.appendDummyInput()
             .appendField(Blockly.Msg.LED_DRAW + Blockly.Msg.LED_PIXEL);
         this.appendValueInput("COLOR")

+ 1 - 1
blockly/blocks_compressed.js

@@ -420,7 +420,7 @@ Blockly.Blocks.led_setrotation={init:function(){this.appendDummyInput().appendFi
 Blockly.Blocks.led_setbright={init:function(){this.appendValueInput("BRIGHTNESS").setCheck(Blockly.Types.NUMBER.checkList).appendField(Blockly.Msg.LED_SET_BRIGHTNESS);this.setInputsInline(!0);this.setPreviousStatement(!0);this.setNextStatement(!0);this.setColour(Blockly.Blocks.led.HUE);this.setTooltip("");this.setHelpUrl("")},onchange:function(){var a=Blockly.Python.valueToCode(this,"BRIGHTNESS",Blockly.Python.ORDER_ATOMIC);0>a||255<a?this.setWarningText(Blockly.Msg.LED_BRIGHTNESS_WARNING,"fastled_setbright"):
 this.setWarningText(null,"fastled_setbright")},getBlockType:function(){return Blockly.Types.NUMBER}};Blockly.Blocks.led_set_width_height={init:function(){this.appendValueInput("WIDTH").setCheck("Number").appendField(Blockly.Msg.LED_WIDTH);this.appendValueInput("HEIGHT").setCheck("Number").appendField(Blockly.Msg.LED_HEIGHT);this.setOutput(!0,"String");this.setInputsInline(!0);this.setColour(Blockly.Blocks.led.HUE);this.setTooltip("");this.setHelpUrl("")}};
 Blockly.Blocks.led_set_position={init:function(){this.appendValueInput("POSX").setCheck("Number").appendField("X:");this.appendValueInput("POSY").setCheck("Number").appendField("Y:");this.setOutput(!0,"String");this.setInputsInline(!0);this.setColour(Blockly.Blocks.led.HUE);this.setTooltip("");this.setHelpUrl("")}};
-Blockly.Blocks.led_drawpixel={init:function(){this.appendDummyInput().appendField(new Blockly.FieldImage("./../blockly/media/pixel.png",25,25,"15"));this.appendDummyInput().appendField(Blockly.Msg.LED_DRAW+Blockly.Msg.LED_PIXEL);this.appendValueInput("COLOR").setCheck("String").appendField(Blockly.Msg.LED_COLOR);this.appendValueInput("POS").setCheck("String").appendField(Blockly.Msg.LED_COORDINATE);this.setInputsInline(!1);this.setPreviousStatement(!0);this.setNextStatement(!0);this.setColour(Blockly.Blocks.led.HUE);
+Blockly.Blocks.led_drawpixel={init:function(){this.appendDummyInput().appendField(new Blockly.FieldImage("./blockly/media/pixel.png",25,25,"15"));this.appendDummyInput().appendField(Blockly.Msg.LED_DRAW+Blockly.Msg.LED_PIXEL);this.appendValueInput("COLOR").setCheck("String").appendField(Blockly.Msg.LED_COLOR);this.appendValueInput("POS").setCheck("String").appendField(Blockly.Msg.LED_COORDINATE);this.setInputsInline(!1);this.setPreviousStatement(!0);this.setNextStatement(!0);this.setColour(Blockly.Blocks.led.HUE);
 this.setTooltip("");this.setHelpUrl("")}};
 Blockly.Blocks.led_drawrect={init:function(){this.appendDummyInput().appendField(new Blockly.FieldImage("./../blockly/media/rect.png",25,25,"15"));this.appendDummyInput().appendField(Blockly.Msg.LED_DRAW).appendField(new Blockly.FieldDropdown([[Blockly.Msg.OLCD_FULL,"fill"],[Blockly.Msg.OLCD_STROKED,"draw"]]),"rect_type").appendField(Blockly.Msg.LED_RECTANGLE);this.appendValueInput("COLOR").setCheck("String").appendField(Blockly.Msg.LED_COLOR);this.appendValueInput("SIZE").setCheck("String").appendField(Blockly.Msg.LED_SIZE);this.appendValueInput("POS").setCheck("String").appendField(Blockly.Msg.LED_COORDINATE);
 this.setInputsInline(!1);this.setPreviousStatement(!0);this.setNextStatement(!0);this.setColour(Blockly.Blocks.led.HUE);this.setTooltip("");this.setHelpUrl("")}};

+ 1 - 1
python/blockly/blocks/arduino/led.js

@@ -133,7 +133,7 @@ Blockly.Blocks['led_drawpixel'] = {
     init: function() {
         this.appendDummyInput()
             .appendField(
-                new Blockly.FieldImage("./../blockly/media/pixel.png", 25, 25, "15"));
+                new Blockly.FieldImage("./blockly/media/pixel.png", 25, 25, "15"));
         this.appendDummyInput()
             .appendField(Blockly.Msg.LED_DRAW + Blockly.Msg.LED_PIXEL);
         this.appendValueInput("COLOR")

+ 1 - 1
python/blockly/blocks/python/iot.js

@@ -156,7 +156,7 @@ Blockly.Blocks['iot_lcd_drawpixel'] = {
     init: function () {
         this.appendDummyInput()
             .appendField(
-                new Blockly.FieldImage("./../blockly/media/pixel.png", 25, 25, "15"));
+                new Blockly.FieldImage("./blockly/media/pixel.png", 25, 25, "15"));
         this.appendDummyInput()
             .appendField(Blockly.Msg.LED_DRAW + Blockly.Msg.LED_PIXEL);
         this.appendValueInput("COLOR")

+ 1 - 1
python/blockly/blocks_compressed.js

@@ -420,7 +420,7 @@ Blockly.Blocks.led_setrotation={init:function(){this.appendDummyInput().appendFi
 Blockly.Blocks.led_setbright={init:function(){this.appendValueInput("BRIGHTNESS").setCheck(Blockly.Types.NUMBER.checkList).appendField(Blockly.Msg.LED_SET_BRIGHTNESS);this.setInputsInline(!0);this.setPreviousStatement(!0);this.setNextStatement(!0);this.setColour(Blockly.Blocks.led.HUE);this.setTooltip("");this.setHelpUrl("")},onchange:function(){var a=Blockly.Python.valueToCode(this,"BRIGHTNESS",Blockly.Python.ORDER_ATOMIC);0>a||255<a?this.setWarningText(Blockly.Msg.LED_BRIGHTNESS_WARNING,"fastled_setbright"):
 this.setWarningText(null,"fastled_setbright")},getBlockType:function(){return Blockly.Types.NUMBER}};Blockly.Blocks.led_set_width_height={init:function(){this.appendValueInput("WIDTH").setCheck("Number").appendField(Blockly.Msg.LED_WIDTH);this.appendValueInput("HEIGHT").setCheck("Number").appendField(Blockly.Msg.LED_HEIGHT);this.setOutput(!0,"String");this.setInputsInline(!0);this.setColour(Blockly.Blocks.led.HUE);this.setTooltip("");this.setHelpUrl("")}};
 Blockly.Blocks.led_set_position={init:function(){this.appendValueInput("POSX").setCheck("Number").appendField("X:");this.appendValueInput("POSY").setCheck("Number").appendField("Y:");this.setOutput(!0,"String");this.setInputsInline(!0);this.setColour(Blockly.Blocks.led.HUE);this.setTooltip("");this.setHelpUrl("")}};
-Blockly.Blocks.led_drawpixel={init:function(){this.appendDummyInput().appendField(new Blockly.FieldImage("./../blockly/media/pixel.png",25,25,"15"));this.appendDummyInput().appendField(Blockly.Msg.LED_DRAW+Blockly.Msg.LED_PIXEL);this.appendValueInput("COLOR").setCheck("String").appendField(Blockly.Msg.LED_COLOR);this.appendValueInput("POS").setCheck("String").appendField(Blockly.Msg.LED_COORDINATE);this.setInputsInline(!1);this.setPreviousStatement(!0);this.setNextStatement(!0);this.setColour(Blockly.Blocks.led.HUE);
+Blockly.Blocks.led_drawpixel={init:function(){this.appendDummyInput().appendField(new Blockly.FieldImage("./blockly/media/pixel.png",25,25,"15"));this.appendDummyInput().appendField(Blockly.Msg.LED_DRAW+Blockly.Msg.LED_PIXEL);this.appendValueInput("COLOR").setCheck("String").appendField(Blockly.Msg.LED_COLOR);this.appendValueInput("POS").setCheck("String").appendField(Blockly.Msg.LED_COORDINATE);this.setInputsInline(!1);this.setPreviousStatement(!0);this.setNextStatement(!0);this.setColour(Blockly.Blocks.led.HUE);
 this.setTooltip("");this.setHelpUrl("")}};
 Blockly.Blocks.led_drawrect={init:function(){this.appendDummyInput().appendField(new Blockly.FieldImage("./../blockly/media/rect.png",25,25,"15"));this.appendDummyInput().appendField(Blockly.Msg.LED_DRAW).appendField(new Blockly.FieldDropdown([[Blockly.Msg.OLCD_FULL,"fill"],[Blockly.Msg.OLCD_STROKED,"draw"]]),"rect_type").appendField(Blockly.Msg.LED_RECTANGLE);this.appendValueInput("COLOR").setCheck("String").appendField(Blockly.Msg.LED_COLOR);this.appendValueInput("SIZE").setCheck("String").appendField(Blockly.Msg.LED_SIZE);this.appendValueInput("POS").setCheck("String").appendField(Blockly.Msg.LED_COORDINATE);
 this.setInputsInline(!1);this.setPreviousStatement(!0);this.setNextStatement(!0);this.setColour(Blockly.Blocks.led.HUE);this.setTooltip("");this.setHelpUrl("")}};

+ 1 - 1
python/src/blockly/cocoblockly.js

@@ -1356,7 +1356,7 @@ async function cocoblockly() {
 
     //window.parent.postMessage({ id: 'windowLoad', status: 'onload' }, '*');
 
-    let jsonData = await getJsonData('../../data.json');
+    let jsonData = await getJsonData('../data.json');
     CCB.str_group = jsonData.translation[CCB.lang];
     CCB.examplesMap = jsonData.examples;
     document.getElementById('ConnectBtn').innerHTML = CCB.str_group.connect;

+ 1 - 1
python/src/blockly/dist/cocoblockly.dev.js

@@ -1353,7 +1353,7 @@ function cocoblockly() {
           };
 
           _context.next = 4;
-          return regeneratorRuntime.awrap(getJsonData('../../data.json'));
+          return regeneratorRuntime.awrap(getJsonData('../data.json'));
 
         case 4:
           jsonData = _context.sent;

File diff suppressed because it is too large
+ 0 - 0
python/src/blockly/dist/cocoblockly.prod.js


+ 1 - 1
src/blockly/cocoblockly.js

@@ -1356,7 +1356,7 @@ async function cocoblockly() {
 
     //window.parent.postMessage({ id: 'windowLoad', status: 'onload' }, '*');
 
-    let jsonData = await getJsonData('../../data.json');
+    let jsonData = await getJsonData('../data.json');
     CCB.str_group = jsonData.translation[CCB.lang];
     CCB.examplesMap = jsonData.examples;
     document.getElementById('ConnectBtn').innerHTML = CCB.str_group.connect;

Some files were not shown because too many files changed in this diff