rearragememetn

Author: ddededodediamante

blocks_vertical/data.js

@@ -455,14 +455,14 @@ Blockly.Blocks['data_listcontainsitem'] = {
   }
 };
 
-Blockly.Blocks['data_showlist'] = {
+Blockly.Blocks['data_listasarray'] = {
   /**
-   * Block to show a list.
+   * Block for turning list into array.
    * @this Blockly.Block
    */
   init: function() {
     this.jsonInit({
-      "message0": Blockly.Msg.DATA_SHOWLIST,
+      "message0": Blockly.Msg.DATA_LISTASARRAY,
       "args0": [
         {
           "type": "field_variable",
@@ -471,40 +471,45 @@ Blockly.Blocks['data_showlist'] = {
         }
       ],
       "category": Blockly.Categories.dataLists,
-      "extensions": ["colours_data_lists", "shape_statement"]
+      "extensions": ["colours_data_lists", "output_array"]
     });
   }
 };
 
-Blockly.Blocks['data_hidelist'] = {
+Blockly.Blocks['data_setlistarray'] = {
   /**
-   * Block to hide a list.
+   * Block to set a list to array.
    * @this Blockly.Block
    */
   init: function() {
     this.jsonInit({
-      "message0": Blockly.Msg.DATA_HIDELIST,
+      "message0": Blockly.Msg.DATA_SETLISTARRAY,
       "args0": [
         {
           "type": "field_variable",
           "name": "LIST",
           "variableTypes": [Blockly.LIST_VARIABLE_TYPE]
-        }
+        },
+        {
+          "type": "input_value",
+          "name": "ARRAY",
+          "check": "Array"
+        },
       ],
       "category": Blockly.Categories.dataLists,
       "extensions": ["colours_data_lists", "shape_statement"]
     });
   }
 };
 
-Blockly.Blocks['data_listasarray'] = {
+Blockly.Blocks['data_showlist'] = {
   /**
-   * Block for turning list into array.
+   * Block to show a list.
    * @this Blockly.Block
    */
   init: function() {
     this.jsonInit({
-      "message0": Blockly.Msg.DATA_LISTASARRAY,
+      "message0": Blockly.Msg.DATA_SHOWLIST,
       "args0": [
         {
           "type": "field_variable",
@@ -513,30 +518,25 @@ Blockly.Blocks['data_listasarray'] = {
         }
       ],
       "category": Blockly.Categories.dataLists,
-      "extensions": ["colours_data_lists", "output_array"]
+      "extensions": ["colours_data_lists", "shape_statement"]
     });
   }
 };
 
-Blockly.Blocks['data_setlistarray'] = {
+Blockly.Blocks['data_hidelist'] = {
   /**
-   * Block to set a list to array.
+   * Block to hide a list.
    * @this Blockly.Block
    */
   init: function() {
     this.jsonInit({
-      "message0": Blockly.Msg.DATA_SETLISTARRAY,
+      "message0": Blockly.Msg.DATA_HIDELIST,
       "args0": [
         {
           "type": "field_variable",
           "name": "LIST",
           "variableTypes": [Blockly.LIST_VARIABLE_TYPE]
-        },
-        {
-          "type": "input_value",
-          "name": "ARRAY",
-          "check": "Array"
-        },
+        }
       ],
       "category": Blockly.Categories.dataLists,
       "extensions": ["colours_data_lists", "shape_statement"]

core/data_category.js

@@ -83,12 +83,12 @@ Blockly.DataCategory = function(workspace) {
     Blockly.DataCategory.addItemOfList(xmlList, firstVariable);
     Blockly.DataCategory.addItemNumberOfList(xmlList, firstVariable);
     Blockly.DataCategory.addLengthOfList(xmlList, firstVariable);
-    Blockly.DataCategory.addListAsArray(xmlList, firstVariable);
     Blockly.DataCategory.addListContainsItem(xmlList, firstVariable);
     Blockly.DataCategory.addSep(xmlList);
+    Blockly.DataCategory.addListAsArray(xmlList, firstVariable);
+    Blockly.DataCategory.addSetListArray(xmlList, firstVariable);
     Blockly.DataCategory.addShowList(xmlList, firstVariable);
     Blockly.DataCategory.addHideList(xmlList, firstVariable);
-    Blockly.DataCategory.addSetListArray(xmlList, firstVariable);
   }
 
   // Now add table variables to the flyout
@@ -385,51 +385,51 @@ Blockly.DataCategory.addListContainsItem = function(xmlList, variable) {
 };
 
 /**
- * Construct and add a data_showlist block to xmlList.
+ * Construct and add a data_lengthoflist block to xmlList.
  * @param {!Array.<!Element>} xmlList Array of XML block elements.
  * @param {?Blockly.VariableModel} variable Variable to select in the field.
  */
-Blockly.DataCategory.addShowList = function(xmlList, variable) {
-  // <block type="data_showlist">
+Blockly.DataCategory.addListAsArray = function(xmlList, variable) {
+  // <block type="data_listasarray">
   //   <field name="LIST" variabletype="list" id="">variablename</field>
   // </block>
-  Blockly.DataCategory.addBlock(xmlList, variable, 'data_showlist', 'LIST');
+  Blockly.DataCategory.addBlock(xmlList, variable, 'data_listasarray', 'LIST');
 };
 
 /**
- * Construct and add a data_hidelist block to xmlList.
+ * Construct and add a data_lengthoflist block to xmlList.
  * @param {!Array.<!Element>} xmlList Array of XML block elements.
  * @param {?Blockly.VariableModel} variable Variable to select in the field.
  */
-Blockly.DataCategory.addHideList = function(xmlList, variable) {
-  // <block type="data_hidelist">
+Blockly.DataCategory.addSetListArray = function(xmlList, variable) {
+  // <block type="data_setlistarray">
   //   <field name="LIST" variabletype="list" id="">variablename</field>
   // </block>
-  Blockly.DataCategory.addBlock(xmlList, variable, 'data_hidelist', 'LIST');
+  Blockly.DataCategory.addBlock(xmlList, variable, 'data_setlistarray', 'LIST');
 };
 
 /**
- * Construct and add a data_lengthoflist block to xmlList.
+ * Construct and add a data_showlist block to xmlList.
  * @param {!Array.<!Element>} xmlList Array of XML block elements.
  * @param {?Blockly.VariableModel} variable Variable to select in the field.
  */
-Blockly.DataCategory.addListAsArray = function(xmlList, variable) {
-  // <block type="data_listasarray">
+Blockly.DataCategory.addShowList = function(xmlList, variable) {
+  // <block type="data_showlist">
   //   <field name="LIST" variabletype="list" id="">variablename</field>
   // </block>
-  Blockly.DataCategory.addBlock(xmlList, variable, 'data_listasarray', 'LIST');
+  Blockly.DataCategory.addBlock(xmlList, variable, 'data_showlist', 'LIST');
 };
 
 /**
- * Construct and add a data_lengthoflist block to xmlList.
+ * Construct and add a data_hidelist block to xmlList.
  * @param {!Array.<!Element>} xmlList Array of XML block elements.
  * @param {?Blockly.VariableModel} variable Variable to select in the field.
  */
-Blockly.DataCategory.addSetListArray = function(xmlList, variable) {
-  // <block type="data_setlistarray">
+Blockly.DataCategory.addHideList = function(xmlList, variable) {
+  // <block type="data_hidelist">
   //   <field name="LIST" variabletype="list" id="">variablename</field>
   // </block>
-  Blockly.DataCategory.addBlock(xmlList, variable, 'data_setlistarray', 'LIST');
+  Blockly.DataCategory.addBlock(xmlList, variable, 'data_hidelist', 'LIST');
 };
 
 /**

msg/messages.js

@@ -72,10 +72,10 @@ Blockly.Msg.DATA_ITEMOFLIST = 'item %1 of %2';
 Blockly.Msg.DATA_ITEMNUMOFLIST = 'item # of %1 in %2';
 Blockly.Msg.DATA_LENGTHOFLIST = 'length of %1';
 Blockly.Msg.DATA_LISTCONTAINSITEM = '%1 contains %2?';
-Blockly.Msg.DATA_SHOWLIST = 'show list %1';
-Blockly.Msg.DATA_HIDELIST = 'hide list %1';
 Blockly.Msg.DATA_LISTASARRAY = '%1 as array';
 Blockly.Msg.DATA_SETLISTARRAY = 'set list %1 to %2';
+Blockly.Msg.DATA_SHOWLIST = 'show list %1';
+Blockly.Msg.DATA_HIDELIST = 'hide list %1';
 Blockly.Msg.DATA_INDEX_ALL = 'all';
 Blockly.Msg.DATA_INDEX_LAST = 'last';
 Blockly.Msg.DATA_INDEX_RANDOM = 'random';