Merge branch 'develop' into develop-builds

Author: CubesterYT

blocks_vertical/data.js

@@ -539,12 +539,6 @@ Blockly.Blocks.defaultToolbox = '<xml id="toolbox-categories" style="display: no
     '</block>' +
     '<block type="json_to_string" id="json_to_string">' +
     '</block>' +
-    '<block type="json_keys" id="json_keys">' +
-    '</block>' +
-    '<block type="json_values" id="json_values">' +
-    '</block>' +
-    '<block type="json_entries" id="json_entries">' +
-    '</block>' +
     '<block type="json_get_properties" id="json_get_properties">' +
     '</block>' +
     '<block type="json_value_of_key" id="json_value_of_key">' +

blocks_vertical/default_toolbox.js

@@ -83,69 +83,6 @@ Blockly.Blocks['json_to_string'] = {
   }
 };
 
-Blockly.Blocks['json_keys'] = {
-  /**
-   * Fetches the keys of the object
-   * @this Blockly.Block
-   */
-  init: function() {
-    this.jsonInit({
-      "message0": Blockly.Msg.JSON_KEYS,
-      "args0": [
-        {
-          "type": "input_value",
-          "name": "OBJ",
-          "check": "Object"
-        },
-      ],
-      "category": Blockly.Categories.json,
-      "extensions": ["colours_json", "output_array"]
-    });
-  }
-};
-
-Blockly.Blocks['json_values'] = {
-  /**
-   * Fetches the values of the object
-   * @this Blockly.Block
-   */
-  init: function() {
-    this.jsonInit({
-      "message0": Blockly.Msg.JSON_VALUES,
-      "args0": [
-        {
-          "type": "input_value",
-          "name": "OBJ",
-          "check": "Object"
-        },
-      ],
-      "category": Blockly.Categories.json,
-      "extensions": ["colours_json", "output_array"]
-    });
-  }
-};
-
-Blockly.Blocks['json_entries'] = {
-  /**
-   * Fetches the entries of the object
-   * @this Blockly.Block
-   */
-  init: function() {
-    this.jsonInit({
-      "message0": Blockly.Msg.JSON_ENTRIES,
-      "args0": [
-        {
-          "type": "input_value",
-          "name": "OBJ",
-          "check": "Object"
-        },
-      ],
-      "category": Blockly.Categories.json,
-      "extensions": ["colours_json", "output_array"]
-    });
-  }
-};
-
 Blockly.Blocks['json_get_properties'] = {
   /**
    * Fetches keys, values, or entries of an object based on selection.
@@ -159,9 +96,9 @@ Blockly.Blocks['json_get_properties'] = {
           "type": "field_dropdown",
           "name": "PROPERTY",
           "options": [
-            ["keys", "keys"],
-            ["values", "values"],
-            ["entries", "entries"]
+            [Blockly.Msg.JSON_GET_PROPERTIES_KEYS, "keys"],
+            [Blockly.Msg.JSON_GET_PROPERTIES_VALUES, "values"],
+            [Blockly.Msg.JSON_GET_PROPERTIES_ENTRIES, "entries"]
           ]
         },
         {

blocks_vertical/json.js

@@ -263,7 +263,7 @@ Blockly.ScratchBlocks.VerticalExtensions.SCRATCH_EXTENSION = function() {
  */
 Blockly.ScratchBlocks.VerticalExtensions.registerAll = function() {
   var categoryNames =
-      ['control', 'data', 'data_lists', 'json', 'sounds', 'motion', 'looks', 'event',
+      ['control', 'data', 'data_lists', 'data_tables', 'json', 'sounds', 'motion', 'looks', 'event',
         'sensing', 'pen', 'operators', 'more', 'comments'];
   // Register functions for all category colours.
   for (var i = 0; i < categoryNames.length; i++) {

blocks_vertical/vertical_extensions.js

@@ -87,6 +87,13 @@ Blockly.Colours = {
     "tertiary": "#E64D00",
     "quaternary": "#E64D00"
   },
+  // Same reasoning as data_lists, but this is to differentiate tables
+  "data_tables": {
+    "primary": "#66BD5C",
+    "secondary": "#5CAA53",
+    "tertiary": "#52974A",
+    "quaternary": "#52974A"
+  },
   "json": {
     "primary": "#5755D4",
     "secondary": "#4644AA",

core/colours.js

@@ -271,6 +271,7 @@ Blockly.Categories = {
   "pen": "pen",
   "data": "data",
   "dataLists": "data-lists",
+  "dataTables": "data-tables",
   "json": "json",
   "event": "events",
   "control": "control",
@@ -349,6 +350,14 @@ Blockly.NEW_BROADCAST_MESSAGE_ID = 'NEW_BROADCAST_MESSAGE_ID';
  */
 Blockly.BROADCAST_MESSAGE_VARIABLE_TYPE = 'broadcast_msg';
 
+/**
+ * String representing the variable type of table blocks.
+ * This string, for use in differentiating between types of variables,
+ * indicates that the current variable is a table.
+ * @const {string}
+ */
+Blockly.TABLE_VARIABLE_TYPE = 'table';
+
 /**
  * String representing the variable type of list blocks.
  * This string, for use in differentiating between types of variables,