Move ardublockly_classic into ardublockly/classic/.

ArdublocklyServer/js/ArduServerCompiler.js

@@ -35,7 +35,7 @@ ArduServerCompiler.ajaxPostForm = function(url, params, callback) {
         callback(null);
       }
     }
-  }
+  };
 
   // Send the data
   try {
@@ -71,7 +71,7 @@ ArduServerCompiler.ajaxPostPlain = function(url, data, callback) {
         callback(null);
       }
     }
-  }
+  };
 
   // Send the data
   try {

ardublockly_classic/ardublockly_classic.js → ardublockly/classic/ardublockly_classic.js

@@ -82,7 +82,7 @@ ArduinoClassic.init = function() {
 
   // Inject Blockly asynchronously into content_blocks
   ArduinoClassic.injectBlockly(
-      document.getElementById('content_blocks'), 'ardublockly_classic_toolbox.xml');
+      document.getElementById('content_blocks'), '../ardublockly_toolbox.xml');
 
   // Create function to resize blockly if page layout changes
   var onresize = function(e) {
@@ -334,7 +334,7 @@ ArduinoClassic.injectBlockly = function(blockly_el, toolbox_path) {
             collapse: true,
             comments: true,
             disable: true,
-            media: '../blockly/media/',
+            media: '../../blockly/media/',
             rtl: false,
             scrollbars: true,
             toolbox: request.responseText,

ardublockly_classic/index.html → ardublockly/classic/index.html

@@ -6,49 +6,49 @@
   <title>Ardublockly: Arduino Code</title>
   <link rel="stylesheet" href="ardublockly_classic.css">
   <!-- Ardublockly - For now uncompressed files -->
-  <!--script src="../blockly/blockly_compressed.js"></script-->
-  <script src="../blockly/blockly_uncompressed.js"></script>
-  <!--script src="../blockly/blocks_compressed.js"></script-->
-  <script src="../blockly/generators/arduino.js"></script>
-  <script src="../blockly/blocks/arduino/io.js"></script>
-  <script src="../blockly/blocks/arduino/map.js"></script>
-  <script src="../blockly/blocks/arduino/serial.js"></script>
-  <script src="../blockly/blocks/arduino/servo.js"></script>
-  <script src="../blockly/blocks/arduino/spi.js"></script>
-  <script src="../blockly/blocks/arduino/stepper.js"></script>
-  <script src="../blockly/blocks/arduino/time.js"></script>
-  <script src="../blockly/blocks/arduino/variables.js"></script>
-  <script src="../blockly/blocks/logic.js"></script>
-  <script src="../blockly/blocks/loops.js"></script>
-  <script src="../blockly/blocks/math.js"></script>
-  <script src="../blockly/blocks/text.js"></script>
-  <script src="../blockly/blocks/lists.js"></script>
-  <script src="../blockly/blocks/colour.js"></script>
-  <script src="../blockly/blocks/variables.js"></script>
-  <script src="../blockly/blocks/procedures.js"></script>
-  <script src="../blockly/generators/arduino/io.js"></script>
-  <script src="../blockly/generators/arduino/lists.js"></script>
-  <script src="../blockly/generators/arduino/logic.js"></script>
-  <script src="../blockly/generators/arduino/loops.js"></script>
-  <script src="../blockly/generators/arduino/map.js"></script>
-  <script src="../blockly/generators/arduino/math.js"></script>
-  <script src="../blockly/generators/arduino/procedures.js"></script>
-  <script src="../blockly/generators/arduino/serial.js"></script>
-  <script src="../blockly/generators/arduino/servo.js"></script>
-  <script src="../blockly/generators/arduino/spi.js"></script>
-  <script src="../blockly/generators/arduino/stepper.js"></script>
-  <script src="../blockly/generators/arduino/text.js"></script>
-  <script src="../blockly/generators/arduino/time.js"></script>
-  <script src="../blockly/generators/arduino/variables.js"></script>
+  <!--script src="../../blockly/blockly_compressed.js"></script-->
+  <script src="../../blockly/blockly_uncompressed.js"></script>
+  <!--script src="../../blockly/blocks_compressed.js"></script-->
+  <script src="../../blockly/generators/arduino.js"></script>
+  <script src="../../blockly/blocks/arduino/io.js"></script>
+  <script src="../../blockly/blocks/arduino/map.js"></script>
+  <script src="../../blockly/blocks/arduino/serial.js"></script>
+  <script src="../../blockly/blocks/arduino/servo.js"></script>
+  <script src="../../blockly/blocks/arduino/spi.js"></script>
+  <script src="../../blockly/blocks/arduino/stepper.js"></script>
+  <script src="../../blockly/blocks/arduino/time.js"></script>
+  <script src="../../blockly/blocks/arduino/variables.js"></script>
+  <script src="../../blockly/blocks/logic.js"></script>
+  <script src="../../blockly/blocks/loops.js"></script>
+  <script src="../../blockly/blocks/math.js"></script>
+  <script src="../../blockly/blocks/text.js"></script>
+  <script src="../../blockly/blocks/lists.js"></script>
+  <script src="../../blockly/blocks/colour.js"></script>
+  <script src="../../blockly/blocks/variables.js"></script>
+  <script src="../../blockly/blocks/procedures.js"></script>
+  <script src="../../blockly/generators/arduino/io.js"></script>
+  <script src="../../blockly/generators/arduino/lists.js"></script>
+  <script src="../../blockly/generators/arduino/logic.js"></script>
+  <script src="../../blockly/generators/arduino/loops.js"></script>
+  <script src="../../blockly/generators/arduino/map.js"></script>
+  <script src="../../blockly/generators/arduino/math.js"></script>
+  <script src="../../blockly/generators/arduino/procedures.js"></script>
+  <script src="../../blockly/generators/arduino/serial.js"></script>
+  <script src="../../blockly/generators/arduino/servo.js"></script>
+  <script src="../../blockly/generators/arduino/spi.js"></script>
+  <script src="../../blockly/generators/arduino/stepper.js"></script>
+  <script src="../../blockly/generators/arduino/text.js"></script>
+  <script src="../../blockly/generators/arduino/time.js"></script>
+  <script src="../../blockly/generators/arduino/variables.js"></script>
   <!-- Load Blockly's language strings -->
-  <script src="../blockly/msg/js/en.js"></script>
+  <script src="../../blockly/msg/js/en.js"></script>
   <!-- Arduino Server Compiler -->
-  <script src="../ArdublocklyServer/js/ArduServerCompiler.js"></script>
+  <script src="../../ArdublocklyServer/js/ArduServerCompiler.js"></script>
   <!-- Prettify -->
-  <link rel="stylesheet" href="../blockly/demos/prettify.css">
-  <script src="../blockly/demos/prettify.js"></script>
+  <link rel="stylesheet" href="../../blockly/demos/prettify.css">
+  <script src="../../blockly/demos/prettify.js"></script>
   <!-- FileSaver from arduino materia app -->
-  <script src="../ardublockly/js_libs/FileSaver.min.js"></script>
+  <script src="../js_libs/FileSaver.min.js"></script>
 </head>
 
 <body>
@@ -65,22 +65,22 @@
               <td id="tab_xml" class="taboff">XML</td>
               <td class="tabmax">
                 <button id="peekCode" class="button_text" title="Toggle the code view on the side">
-                  Code peek <img src="../../media/1x1.gif">
+                  Code peek <img src="../../blockly/media/1x1.gif">
                 </button>
                 <button id="openButton" title="Load blocks">
-                  <img src="../blockly/media/1x1.gif" class="icon21 load">
+                  <img src="../../blockly/media/1x1.gif" class="icon21 load">
                 </button>
                 <button id="saveButton" title="Save blocks">
-                  <img src="../blockly/media/1x1.gif" class="icon21 save">
+                  <img src="../../blockly/media/1x1.gif" class="icon21 save">
                 </button>
                 <button id="trashButton" title="Discard all blocks">
-                  <img src="../blockly/media/1x1.gif" class="icon21 trash">
+                  <img src="../../blockly/media/1x1.gif" class="icon21 trash">
                 </button>
                 <button id="settingsButton" title="Open the Settings">
-                  <img src="../blockly/media/1x1.gif" class="icon21 settings">
+                  <img src="../../blockly/media/1x1.gif" class="icon21 settings">
                 </button>
                 <button id="runButton" class="primary" title="Run the program defined by the blocks in the workspace">
-                  <img src='../blockly/media/1x1.gif' class="icon21 run">
+                  <img src='../../blockly/media/1x1.gif' class="icon21 run">
                 </button>
               </td>
             </tr>

ardublockly_classic/settings.html → ardublockly/classic/settings.html

@@ -6,7 +6,7 @@
   <title>Ardublockly: Arduino Code Settings</title>
   <link rel="stylesheet" href="settings.css">
   <!-- Arduino Server Compiler -->
-  <script src="../ArdublocklyServer/js/ArduServerCompiler.js"></script>
+  <script src="../../ArdublocklyServer/js/ArduServerCompiler.js"></script>
 </head>
 
 <body>