Merge pull request #91 from RoboErikG/roboerikg-update

bug #90 Update compressed.js files to latest from develop branch
google · Mar 3, 2016 · 6e47505 · 6e47505
2 parents 2f060d5 + 8f68023
commit 6e47505
Show file tree

Hide file tree

Showing 8 changed files with 760 additions and 2,401 deletions.
diff --git a/blocklydemo/src/main/assets/webblockly/blockly_compressed.js b/blocklydemo/src/main/assets/webblockly/blockly_compressed.js
diff --git a/blocklydemo/src/main/assets/webblockly/blocks_compressed.js b/blocklydemo/src/main/assets/webblockly/blocks_compressed.js
diff --git a/blocklydemo/src/main/assets/webblockly/index.html b/blocklydemo/src/main/assets/webblockly/index.html
@@ -5,13 +5,10 @@
   <meta name="google" value="notranslate">
   <title>Blockly Demo:</title>
   <link rel="stylesheet" href="style.css">
-  <!--<script src="/storage.js"></script>-->
-  <script src="blockly_compressed.js"></script>
-  <script src="blocks_compressed.js"></script>
-  <script src="javascript_compressed.js"></script>
-  <!--<script src="../../python_compressed.js"></script>
-  <script src="../../php_compressed.js"></script>
-  <script src="../../dart_compressed.js"></script>-->
+  <!--Note: The three compressed files are pulled in from blocklylib during compilation-->
+  <script src="../blockly_compressed.js"></script>
+  <script src="../blocks_compressed.js"></script>
+  <script src="../javascript_compressed.js"></script>
   <script src="code.js"></script>
 </head>
 <body>

diff --git a/blocklydemo/src/main/assets/webblockly/javascript_compressed.js b/blocklydemo/src/main/assets/webblockly/javascript_compressed.js
diff --git a/blocklylib/src/main/assets/background_compiler.html b/blocklylib/src/main/assets/background_compiler.html
@@ -48,17 +48,6 @@
 
 <script>
     function generate(blocklyxml) {
-      // TODO: (#52) Remove variables hack
-      if (Blockly.Blocks['variables_set']) {
-        Blockly.Blocks['variables_set'].getVars = function() {
-          return [this.getFieldValue('VAR')];
-        };
-      }
-      if (Blockly.Blocks['variables_get']) {
-        Blockly.Blocks['variables_get'].getVars = function() {
-          return [this.getFieldValue('VAR')];
-        };
-      }
       // Parse the XML into a tree.
       var xmlText = blocklyxml;
       var dom;

diff --git a/blocklylib/src/main/assets/blockly_compressed.js b/blocklylib/src/main/assets/blockly_compressed.js
diff --git a/blocklylib/src/main/assets/blocks_compressed.js b/blocklylib/src/main/assets/blocks_compressed.js
diff --git a/blocklylib/src/main/assets/javascript_compressed.js b/blocklylib/src/main/assets/javascript_compressed.js