Merge pull request #334 from entrylabs/hotfix/variable_container_lang

variable_container lang fixed
entrylabs · Jun 8, 2016 · 50f61d1 · 50f61d1
2 parents 96af118 + dd81036
commit 50f61d1
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/dist/entry.js b/dist/entry.js
@@ -856,8 +856,8 @@ Blockly.Blocks.arduino_toggle_led = {init:function() {
   this.setNextStatement(!0);
 }};
 Entry.block.arduino_toggle_led = function(b, a) {
-  var c = a.getNumberValue("VALUE"), d = a.getField("OPERATOR");
-  Entry.hw.setDigitalPortValue(c, "on" == d ? 255 : 0);
+  var c = a.getNumberValue("VALUE"), d = "on" == a.getField("OPERATOR") ? 255 : 0;
+  Entry.hw.setDigitalPortValue(c, d);
   return a.callReturn();
 };
 Blockly.Blocks.arduino_toggle_pwm = {init:function() {
@@ -1057,8 +1057,8 @@ Blockly.Blocks.dplay_select_led = {init:function() {
 Entry.block.dplay_select_led = function(b, a) {
   var c = a.getField("PORT"), d = 7;
   "7" == c ? d = 7 : "8" == c ? d = 8 : "9" == c ? d = 9 : "10" == c && (d = 10);
-  c = a.getField("OPERATOR");
-  Entry.hw.setDigitalPortValue(d, "on" == c ? 255 : 0);
+  c = "on" == a.getField("OPERATOR") ? 255 : 0;
+  Entry.hw.setDigitalPortValue(d, c);
   return a.callReturn();
 };
 Blockly.Blocks.dplay_get_switch_status = {init:function() {
@@ -2068,10 +2068,10 @@ Entry.block.wait_second = function(b, a) {
   }
   a.isStart = !0;
   a.timeFlag = 1;
-  var c = a.getNumberValue("SECOND", a);
+  var c = a.getNumberValue("SECOND", a), c = 60 / (Entry.FPS || 60) * c * 1E3;
   setTimeout(function() {
     a.timeFlag = 0;
-  }, 60 / (Entry.FPS || 60) * c * 1E3);
+  }, c);
   return a;
 };
 Blockly.Blocks.repeat_basic = {init:function() {
@@ -13393,7 +13393,7 @@ Entry.VariableContainer.prototype.createDom = function(b) {
   c = Entry.createElement("li");
   c.addClass("entryVariableAddWorkspace");
   c.addClass("entryVariableListElementWorkspace");
-  c.innerHTML = "+ " + Lang.Workspace.variable_create;
+  c.innerHTML = "+ " + Lang.Workspace.variable_add;
   var f = this;
   this.variableAddButton_ = c;
   c.bindOnClick(function(b) {
@@ -13427,7 +13427,7 @@ Entry.VariableContainer.prototype.createDom = function(b) {
   c = Entry.createElement("li");
   c.addClass("entryVariableAddWorkspace");
   c.addClass("entryVariableListElementWorkspace");
-  c.innerHTML = "+ " + Lang.Workspace.function_create;
+  c.innerHTML = "+ " + Lang.Workspace.function_add;
   this.functionAddButton_ = c;
   c.bindOnClick(function(b) {
     b = a._getBlockMenu();