Merge branch 'develop' into develop-builds

Author: ddededodediamante

blocks_vertical/control.js

@@ -578,4 +578,4 @@ Blockly.Blocks['control_foreach_in_range_item'] = {
       "extensions": ["colours_control", "output_number"]
     });
   }
-};
+};

blocks_vertical/default_toolbox.js

@@ -596,7 +596,7 @@ Blockly.Blocks.defaultToolbox = '<xml id="toolbox-categories" style="display: no
     '</block>' +
     '<block type="json_value_of_index" id="json_value_of_index">' +
       '<value name="INDEX">' +
-        '<shadow type="math_number">' +
+        '<shadow type="json_indexmenu">' +
           '<field name="NUM">0</field>' +
         '</shadow>' +
       '</value>' +
@@ -619,8 +619,8 @@ Blockly.Blocks.defaultToolbox = '<xml id="toolbox-categories" style="display: no
     '</block>' +
     '<block type="json_replace_index" id="json_replace_index">' +
       '<value name="INDEX">' +
-        '<shadow type="math_number">' +
-          '<field name="NUM">1</field>' +
+        '<shadow type="json_indexmenu">' +
+          '<field name="NUM">0</field>' +
         '</shadow>' +
       '</value>' +
       '<value name="ITEM">' +
@@ -631,7 +631,7 @@ Blockly.Blocks.defaultToolbox = '<xml id="toolbox-categories" style="display: no
     '</block>' +
     '<block type="json_delete_index" id="json_delete_index">' +
       '<value name="INDEX">' +
-        '<shadow type="math_number">' +
+        '<shadow type="json_indexmenu">' +
           '<field name="NUM">0</field>' +
         '</shadow>' +
       '</value>' +
@@ -644,6 +644,16 @@ Blockly.Blocks.defaultToolbox = '<xml id="toolbox-categories" style="display: no
       '</value>' +
     '</block>' +
     '<block type="json_slice_array" id="json_slice_array">' +
+      '<value name="START">' +
+        '<shadow type="json_indexmenu">' +
+          '<field name="NUM">1</field>' +
+        '</shadow>' +
+      '</value>' +
+      '<value name="END">' +
+        '<shadow type="json_indexmenu">' +
+          '<field name="NUM">2</field>' +
+        '</shadow>' +
+      '</value>' +
     '</block>' +
     '<block type="json_merge_array" id="json_merge_array">' +
     '</block>' +

blocks_vertical/extensions.js

@@ -110,7 +110,7 @@ Blockly.Blocks['extension_checkbox_test_legacy_json2'] = {
 };
 
 Blockly.Blocks['extension_input'] = {
-  init: function () {
+  init: function() {
     this.jsonInit({
       "message0": 'input %1',
       "args0": [
@@ -126,7 +126,7 @@ Blockly.Blocks['extension_input'] = {
 };
 
 Blockly.Blocks['extension_blockduplicateondrag'] = {
-  init: function () {
+  init: function() {
     this.jsonInit({
       "message0": 'duplicate on drag',
       "duplicateOnDrag": true,

blocks_vertical/json.js

@@ -218,6 +218,34 @@ Blockly.Blocks['json_new_array'] = {
   }
 };
 
+Blockly.Blocks['json_indexmenu'] = {
+  /**
+   * JSON index menu
+   * @this Blockly.Block
+   */
+  init: function() {
+    this.jsonInit({
+      "message0": "%1",
+      "args0": [
+        {
+          "type": "field_numberdropdown",
+          "name": "INDEX",
+          "value": "0",
+          "min": 0,
+          "precision": 1,
+          "options": [
+            ["0", "0"],
+            [Blockly.Msg.DATA_INDEX_LAST, "last"],
+            [Blockly.Msg.DATA_INDEX_RANDOM, "random"]
+          ]
+        }
+      ],
+      "category": Blockly.Categories.json,
+      "extensions": ["colours_textfield", "output_string"]
+    });
+  }
+};
+
 Blockly.Blocks['json_value_of_index'] = {
   /**
    * Fetches the value of the given index
@@ -548,4 +576,4 @@ Blockly.Blocks['json_foreach_index'] = {
       "extensions": ["colours_json", "output_number"]
     });
   }
-};
+};

blocks_vertical/operators.js

@@ -507,7 +507,7 @@ Blockly.Blocks['operator_typeof'] = {
    * Get the specific type of a value.
    * @this Blockly.Block
    */
-  init: function () {
+  init: function() {
     this.jsonInit({
       message0: Blockly.Msg.OPERATORS_TYPEOF,
       args0: [

core/block.js

@@ -142,8 +142,8 @@ Blockly.Block = function(workspace, prototypeName, opt_id) {
    */
   this.outputShape_ = null;
 
-   /**
-   * @type {boolean} 
+  /**
+   * @type {boolean}
    * @private
    */
   this.duplicateOnDrag_ = false;
@@ -1863,4 +1863,4 @@ Blockly.Block.prototype.setDuplicateOnDrag = function(value) {
  */
 Blockly.Block.prototype.canDuplicateOnDrag = function() {
   return this.duplicateOnDrag_ === true && this.isShadow();
-};
+};

core/field_textinput.js

@@ -264,7 +264,7 @@ Blockly.FieldTextInput.prototype.showEditor_ = function(
     var dropDownArrow =
         goog.dom.createDom(goog.dom.TagName.IMG, 'blocklyTextDropDownArrow');
     dropDownArrow.setAttribute('src',
-      Blockly.mainWorkspace.options.pathToMedia +
+        Blockly.mainWorkspace.options.pathToMedia +
       Blockly.FieldTextInput.getTextMenuArrowAsset());
     dropDownArrow.style.width = this.arrowSize_ + 'px';
     dropDownArrow.style.height = this.arrowSize_ + 'px';

core/scratch_blocks_utils.js

@@ -87,7 +87,7 @@ Blockly.scratchBlocksUtils.isShadowArgumentReporter = function(block) {
       block.type == 'argument_reporter_object' ||
       block.type == 'argument_reporter_array' ||
       block.type == 'argument_reporter_string_number'
-    ));
+  ));
 };
 
 /**