Merge pull request #504 from entrylabs/issue/4813

Issue/4813
entrylabs · Nov 1, 2016 · 4d7a6a2 · 4d7a6a2
2 parents 12e0e67 + d54f9d8
commit 4d7a6a2
Show file tree

Hide file tree

Showing 12 changed files with 1,343 additions and 821 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -113,6 +113,7 @@ module.exports = function(grunt) {
     ]);
 
     grunt.registerTask('development', [
+        'watch',
         'closureCompiler:targetName',
         'karma',
         'concurrent'

diff --git a/dist/entry.css b/dist/entry.css
@@ -5225,6 +5225,7 @@ input.entryObjectNameWorkspace:-moz-read-only {
   background-color: rgba(0, 0, 0, 0.6);
 }
 .entryPopup.popupHelper {
+  position: fixed;
   display: -webkit-box;
   display: -moz-box;
   display: -ms-flexbox;

diff --git a/dist/entry.js b/dist/entry.js
diff --git a/dist/entry.min.js b/dist/entry.min.js
diff --git a/example/example.html b/example/example.html
@@ -47,10 +47,13 @@
 <!--language-->
 <script src="../extern/lang/ko.js"></script>
 
+<!--socket.io-->
+<script src="https://cdn.socket.io/socket.io-1.4.5.js"></script>
+
 <!--entryjs-->
 <script src="http://play-entry.com/lib/components-webfontloader/webfont.js"></script>
 <script src="../extern/util/static.js"></script>
-<script src="../dist/entry.min.js"></script>
+<script src="../dist/entry.js"></script>
 <script src="../src/workspace/block_entry.js"></script>
 
 <!--main script-->

diff --git a/extern/util/static.js b/extern/util/static.js
@@ -272,6 +272,7 @@ EntryStatic.getAllBlocks = function() {
                 "arduino_download_source",
                 "arduino_connected",
                 "arduino_reconnect",
+                "arduino_open",
                 "arduino_get_number_sensor_value",
                 "arduino_get_digital_value",
                 "arduino_toggle_led",

diff --git a/src/css/components/popup.less b/src/css/components/popup.less
@@ -12,6 +12,7 @@
 }
 
 .entryPopup.popupHelper {
+    position: fixed;
     display: -webkit-box;
     display: -moz-box;
     display: -ms-flexbox;