Merge branch 'develop' into develop-builds

Author: CubesterYT

README.md

@@ -1,6 +1,6 @@
 ## Playgrounds
 
- - **Vertical blocks**: https://turbowarp.github.io/scratch-blocks/tests/vertical_playground_compressed.html
+ - **Vertical blocks**: https://nitro-bolt.github.io/scratch-blocks/tests/vertical_playground_compressed.html
 
 ## Local development
 

blocks_vertical/data.js

@@ -226,6 +226,35 @@ Blockly.Blocks['data_listindexrandom'] = {
   }
 };
 
+Blockly.Blocks['data_listindex'] = {
+  /**
+   * List index menu, with all secret options.
+   * @this Blockly.Block
+   */
+  init: function() {
+    this.jsonInit({
+      "message0": "%1",
+      "args0": [
+        {
+          "type": "field_numberdropdown",
+          "name": "INDEX",
+          "value": "1",
+          "min": 1,
+          "precision": 1,
+          "options": [
+            ["1", "1"],
+            [Blockly.Msg.DATA_INDEX_LAST, "last"],
+            [Blockly.Msg.DATA_INDEX_ALL, "all"],
+            [Blockly.Msg.DATA_INDEX_RANDOM, "random"]
+          ]
+        }
+      ],
+      "category": Blockly.Categories.data,
+      "extensions": ["colours_textfield", "output_string"]
+    });
+  }
+};
+
 Blockly.Blocks['data_addtolist'] = {
   /**
    * Block to add item to list.

core/data_category.js

@@ -76,7 +76,7 @@ Blockly.DataCategory = function(workspace) {
     Blockly.DataCategory.addAddToList(xmlList, firstVariable);
     Blockly.DataCategory.addSep(xmlList);
     Blockly.DataCategory.addDeleteOfList(xmlList, firstVariable);
-    Blockly.DataCategory.addDeleteAllOfList(xmlList, firstVariable);
+    // Blockly.DataCategory.addDeleteAllOfList(xmlList, firstVariable);
     Blockly.DataCategory.addInsertAtList(xmlList, firstVariable);
     Blockly.DataCategory.addReplaceItemOfList(xmlList, firstVariable);
     Blockly.DataCategory.addSep(xmlList);
@@ -249,27 +249,30 @@ Blockly.DataCategory.addDeleteOfList = function(xmlList, variable) {
   // <block type="data_deleteoflist">
   //   <field name="LIST" variabletype="list" id="">variablename</field>
   //   <value name="INDEX">
-  //     <shadow type="math_integer">
+  //     <shadow type="data_listindex">
   //       <field name="NUM">1</field>
   //     </shadow>
   //   </value>
   // </block>
   Blockly.DataCategory.addBlock(xmlList, variable, 'data_deleteoflist', 'LIST',
-      [['INDEX', 'math_integer', 1]]);
+      [['INDEX', 'data_listindex', 1]]);
 };
 
 /**
  * Construct and add a data_deleteoflist block to xmlList.
+ * Removed from NitroBolt
  * @param {!Array.<!Element>} xmlList Array of XML block elements.
  * @param {?Blockly.VariableModel} variable Variable to select in the field.
  */
+/*
 Blockly.DataCategory.addDeleteAllOfList = function(xmlList, variable) {
   // <block type="data_deletealloflist">
   //   <field name="LIST" variabletype="list" id="">variablename</field>
   // </block>
   Blockly.DataCategory.addBlock(xmlList, variable, 'data_deletealloflist',
       'LIST');
 };
+*/
 
 /**
  * Construct and add a data_insertatlist block to xmlList.
@@ -280,7 +283,7 @@ Blockly.DataCategory.addInsertAtList = function(xmlList, variable) {
   // <block type="data_insertatlist">
   //   <field name="LIST" variabletype="list" id="">variablename</field>
   //   <value name="INDEX">
-  //     <shadow type="math_integer">
+  //     <shadow type="data_listindexrandom">
   //       <field name="NUM">1</field>
   //     </shadow>
   //   </value>
@@ -291,7 +294,7 @@ Blockly.DataCategory.addInsertAtList = function(xmlList, variable) {
   //   </value>
   // </block>
   Blockly.DataCategory.addBlock(xmlList, variable, 'data_insertatlist', 'LIST',
-      [['INDEX', 'math_integer', 1], ['ITEM', 'text', Blockly.Msg.DEFAULT_LIST_ITEM]]);
+      [['INDEX', 'data_listindexrandom', 1], ['ITEM', 'text', Blockly.Msg.DEFAULT_LIST_ITEM]]);
 };
 
 /**
@@ -303,7 +306,7 @@ Blockly.DataCategory.addReplaceItemOfList = function(xmlList, variable) {
   // <block type="data_replaceitemoflist">
   //   <field name="LIST" variabletype="list" id="">variablename</field>
   //   <value name="INDEX">
-  //     <shadow type="math_integer">
+  //     <shadow type="data_listindexrandom">
   //       <field name="NUM">1</field>
   //     </shadow>
   //   </value>
@@ -314,7 +317,7 @@ Blockly.DataCategory.addReplaceItemOfList = function(xmlList, variable) {
   //   </value>
   // </block>
   Blockly.DataCategory.addBlock(xmlList, variable, 'data_replaceitemoflist',
-      'LIST', [['INDEX', 'math_integer', 1], ['ITEM', 'text', Blockly.Msg.DEFAULT_LIST_ITEM]]);
+      'LIST', [['INDEX', 'data_listindexrandom', 1], ['ITEM', 'text', Blockly.Msg.DEFAULT_LIST_ITEM]]);
 };
 
 /**
@@ -326,13 +329,13 @@ Blockly.DataCategory.addItemOfList = function(xmlList, variable) {
   // <block type="data_itemoflist">
   //   <field name="LIST" variabletype="list" id="">variablename</field>
   //   <value name="INDEX">
-  //     <shadow type="math_integer">
+  //     <shadow type="data_listindexrandom">
   //       <field name="NUM">1</field>
   //     </shadow>
   //   </value>
   // </block>
   Blockly.DataCategory.addBlock(xmlList, variable, 'data_itemoflist', 'LIST',
-      [['INDEX', 'math_integer', 1]]);
+      [['INDEX', 'data_listindexrandom', 1]]);
 };
 
 /** Construct and add a data_itemnumoflist block to xmlList.
@@ -510,13 +513,13 @@ Blockly.DataCategory.addDeleteDimensionInTable = function(xmlList, variable) {
   // <block type="data_deletedimensionintable">
   //   <field name="TABLE" variabletype="table" id="">variablename</field>
   //   <value name="INDEX">
-  //     <shadow type="math_integer">
+  //     <shadow type="data_listindexrandom">
   //       <field name="NUM">1</field>
   //     </shadow>
   //   </value>
   // </block>
   Blockly.DataCategory.addBlock(xmlList, variable, 'data_deletedimensionintable', 'TABLE',
-      [['INDEX', 'math_integer', 1]]);
+      [['INDEX', 'data_listindexrandom', 1]]);
 };
 
 /**
@@ -564,13 +567,13 @@ Blockly.DataCategory.addItemsOfDimensionOfTable = function(xmlList, variable) {
   // <block type="data_itemsofdimensionoftable">
   //   <field name="TABLE" variabletype="table" id="">variablename</field>
   //   <value name="INDEX">
-  //     <shadow type="math_integer">
+  //     <shadow type="data_listindexrandom">
   //       <field name="NUM">1</field>
   //     </shadow>
   //   </value>
   // </block>
   Blockly.DataCategory.addBlock(xmlList, variable, 'data_itemsofdimensionoftable', 'TABLE',
-      [['INDEX', 'math_integer', 1]]);
+      [['INDEX', 'data_listindexrandom', 1]]);
 };
 
 /**
@@ -582,13 +585,13 @@ Blockly.DataCategory.addLengthOfDimensionOfTable = function(xmlList, variable) {
   // <block type="data_lengthofdimensionoftable">
   //   <field name="TABLE" variabletype="table" id="">variablename</field>
   //   <value name="INDEX">
-  //     <shadow type="math_integer">
+  //     <shadow type="data_listindexrandom">
   //       <field name="NUM">1</field>
   //     </shadow>
   //   </value>
   // </block>
   Blockly.DataCategory.addBlock(xmlList, variable, 'data_lengthofdimensionoftable', 'TABLE',
-      [['INDEX', 'math_integer', 1]]);
+      [['INDEX', 'data_listindexrandom', 1]]);
 };
 
 /**

core/field_textdropdown.js

@@ -96,7 +96,8 @@ Blockly.FieldTextDropdown.prototype.init = function() {
           'width': this.arrowSize_ + 'px'
         });
     this.arrow_.setAttributeNS('http://www.w3.org/1999/xlink',
-        'xlink:href', Blockly.mainWorkspace.options.pathToMedia + 'dropdown-arrow-dark.svg');
+        'xlink:href', Blockly.mainWorkspace.options.pathToMedia +
+        Blockly.FieldTextInput.getTextMenuArrowAsset());
     this.arrow_.style.cursor = 'pointer';
     this.fieldGroup_.appendChild(this.arrow_);
     this.mouseUpWrapper_ =
@@ -140,7 +141,32 @@ Blockly.FieldTextDropdown.prototype.showEditor_ = function() {
  *     (human-readable text, language-neutral name).
  * @private
  */
-Blockly.FieldTextDropdown.prototype.getOptions_ = Blockly.FieldDropdown.prototype.getOptions_;
+Blockly.FieldTextDropdown.prototype.getOptions = Blockly.FieldDropdown.prototype.getOptions;
+
+/**
+ * Handle the selection of an item in the dropdown menu.
+ * @param {!goog.ui.Menu} menu The Menu component clicked.
+ * @param {!goog.ui.MenuItem} menuItem The MenuItem selected within menu.
+ */
+Blockly.FieldTextDropdown.prototype.onItemSelected = Blockly.FieldDropdown.prototype.onItemSelected;
+
+/**
+ * Get the language-neutral value from this dropdown menu.
+ * @return {string} Current text.
+ */
+Blockly.FieldTextDropdown.prototype.getValue = Blockly.FieldDropdown.prototype.getValue;
+
+/**
+ * Set the language-neutral value for this dropdown menu.
+ * @param {string} newValue New value to set.
+ */
+Blockly.FieldTextDropdown.prototype.setValue = Blockly.FieldDropdown.prototype.setValue;
+
+/**
+ * @return {boolean} True if the option list is generated by a function.
+ *     Otherwise false.
+ */
+Blockly.FieldTextDropdown.prototype.isOptionListDynamic = Blockly.FieldDropdown.prototype.isOptionListDynamic;
 
 /**
  * Position a drop-down arrow at the appropriate location at render-time.

core/field_textinput.js

@@ -96,6 +96,22 @@ Blockly.FieldTextInput.TEXT_MEASURE_PADDING_MAGIC = 45;
  */
 Blockly.FieldTextInput.htmlInput_ = null;
 
+/**
+ * Select caret asset for text menus based on native theme mode.
+ * In default mode, keep the original text-dropdown caret.
+ * In non-default modes, use the regular dropdown caret.
+ *
+ * This is a bit hacky, but it works
+ * @returns {string} Relative media file name.
+ * @package
+ */
+Blockly.FieldTextInput.getTextMenuArrowAsset = function() {
+  var textField = String(Blockly.Colours.textField || '').trim().toLowerCase();
+  var textFieldText = String(Blockly.Colours.textFieldText || '').trim().toLowerCase();
+  var defaultTheme = textField === '#ffffff' && textFieldText === '#575e75';
+  return defaultTheme ? 'dropdown-arrow-dark.svg' : 'dropdown-arrow.svg';
+};
+
 /**
  * Mouse cursor style when over the hotspot that initiates the editor.
  */
@@ -248,7 +264,8 @@ Blockly.FieldTextInput.prototype.showEditor_ = function(
     var dropDownArrow =
         goog.dom.createDom(goog.dom.TagName.IMG, 'blocklyTextDropDownArrow');
     dropDownArrow.setAttribute('src',
-        Blockly.mainWorkspace.options.pathToMedia + 'dropdown-arrow-dark.svg');
+      Blockly.mainWorkspace.options.pathToMedia +
+      Blockly.FieldTextInput.getTextMenuArrowAsset());
     dropDownArrow.style.width = this.arrowSize_ + 'px';
     dropDownArrow.style.height = this.arrowSize_ + 'px';
     dropDownArrow.style.top = this.arrowY_ + 'px';