merge

entrylabs · May 24, 2016 · 8671d3e · 8671d3e
2 parents 6f71967 + e84ae12
commit 8671d3e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 24 deletions.
diff --git a/dist/entry.css b/dist/entry.css
@@ -2351,8 +2351,8 @@ svg .svgBlockGroup text {
 }
 #globalSvg {
   position: fixed;
-  width: 1px;
-  height: 1px;
+  width: 10px;
+  height: 10px;
   overflow: visible;
   z-index: 1111;
   opacity: 0.8;

diff --git a/dist/entry.js b/dist/entry.js
@@ -845,8 +845,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 = "on" == a.getField("OPERATOR") ? 255 : 0;
-  Entry.hw.setDigitalPortValue(c, d);
+  var c = a.getNumberValue("VALUE"), d = a.getField("OPERATOR");
+  Entry.hw.setDigitalPortValue(c, "on" == d ? 255 : 0);
   return a.callReturn();
 };
 Blockly.Blocks.arduino_toggle_pwm = {init:function() {
@@ -1046,8 +1046,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 = "on" == a.getField("OPERATOR") ? 255 : 0;
-  Entry.hw.setDigitalPortValue(d, c);
+  c = a.getField("OPERATOR");
+  Entry.hw.setDigitalPortValue(d, "on" == c ? 255 : 0);
   return a.callReturn();
 };
 Blockly.Blocks.dplay_get_switch_status = {init:function() {
@@ -2057,10 +2057,10 @@ Entry.block.wait_second = function(b, a) {
   }
   a.isStart = !0;
   a.timeFlag = 1;
-  var c = a.getNumberValue("SECOND", a), c = 60 / (Entry.FPS || 60) * c * 1E3;
+  var c = a.getNumberValue("SECOND", a);
   setTimeout(function() {
     a.timeFlag = 0;
-  }, c);
+  }, 60 / (Entry.FPS || 60) * c * 1E3);
   return a;
 };
 Blockly.Blocks.repeat_basic = {init:function() {
@@ -17392,9 +17392,9 @@ Entry.GlobalSvg = {};
       $("#globalSvg").remove();
       var a = $("body");
       this._container = Entry.Dom("div", {classes:["globalSvgSurface", "entryRemove"], id:"globalSvgSurface", parent:a});
-      this.svgDom = Entry.Dom($('<svg id="globalSvg" width="0" height="0"version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>'), {parent:a});
+      this.svgDom = Entry.Dom($('<svg id="globalSvg" width="10" height="10"version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>'), {parent:a});
       this.svg = Entry.SVG("globalSvg");
-      this.top = this.left = this.width = 0;
+      this.top = this.left = 0;
       this._inited = !0;
     }
   };

diff --git a/dist/entry.min.js b/dist/entry.min.js
diff --git a/entry.js.map b/entry.js.map
diff --git a/src/css/components/global_svg.less b/src/css/components/global_svg.less
@@ -9,8 +9,8 @@
 
 #globalSvg {
     position: fixed;
-    width: 1px;
-    height: 1px;
+    width: 10px;
+    height: 10px;
     overflow: visible;
     z-index: 1111;
     opacity: 0.8;

diff --git a/src/workspace/globalSvg.js b/src/workspace/globalSvg.js
@@ -24,13 +24,12 @@ goog.provide('Entry.GlobalSvg');
         });
 
         this.svgDom = Entry.Dom(
-            $('<svg id="globalSvg" width="0" height="0"' +
+            $('<svg id="globalSvg" width="10" height="10"' +
               'version="1.1" xmlns="http://www.w3.org/2000/svg"></svg>'),
             { parent: body }
         );
 
         this.svg = Entry.SVG('globalSvg');
-        this.width = 0;
         this.left = 0;
         this.top = 0;
         this._inited = true;