Merge branch 'develop' into develop-builds

Author: ddededodediamante

blocks_vertical/default_toolbox.js

@@ -541,6 +541,8 @@ Blockly.Blocks.defaultToolbox = '<xml id="toolbox-categories" style="display: no
     '</block>' +
     '<block type="json_values" id="json_values">' +
     '</block>' +
+    '<block type="json_entries" id="json_entries">' +
+    '</block>' +
     '<block type="json_value_of_key" id="json_value_of_key">' +
       '<value name="KEY">' +
         '<shadow type="text">' +

blocks_vertical/json.js

@@ -125,6 +125,27 @@ Blockly.Blocks['json_values'] = {
   }
 };
 
+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_value_of_key'] = {
   /**
    * Fetches the value of the target key

msg/messages.js

@@ -82,6 +82,7 @@ Blockly.Msg.JSON_TO_OBJECT = '%1 to object';
 Blockly.Msg.JSON_TO_STRING = '%1 to string';
 Blockly.Msg.JSON_KEYS = 'keys of %1';
 Blockly.Msg.JSON_VALUES = 'values of %1';
+Blockly.Msg.JSON_ENTRIES = 'entries of %1';
 Blockly.Msg.JSON_VALUE_OF_KEY = 'value of %1 in %2';
 Blockly.Msg.JSON_SET_KEY = 'set %1 in %2 to %3';
 Blockly.Msg.JSON_DELETE_KEY = 'delete %1 in %2';