Merge pull request #123 from tmickel/upstream-march-15

Upstream merge March 15 & remove Lua generators
scratchfoundation · Mar 16, 2016 · cae688e · cae688e
2 parents 210fd0d + 1d0db41
commit cae688e
Show file tree

Hide file tree

Showing 40 changed files with 500 additions and 2,034 deletions.
diff --git a/blockly_compressed_horizontal.js b/blockly_compressed_horizontal.js
diff --git a/blockly_compressed_vertical.js b/blockly_compressed_vertical.js
diff --git a/blockly_uncompressed_horizontal.js b/blockly_uncompressed_horizontal.js
diff --git a/blockly_uncompressed_vertical.js b/blockly_uncompressed_vertical.js
diff --git a/blocks/lists.js b/blocks/lists.js
@@ -123,18 +123,7 @@ Blockly.Blocks['lists_create_with'] = {
     this.updateShape_();
     // Reconnect any child blocks.
     for (var i = 0; i < this.itemCount_; i++) {
-      var connectionChild = connections[i];
-      if (connectionChild) {
-        var parent = connectionChild.targetBlock();
-        var connectionParent = this.getInput('ADD' + i).connection;
-        if (connectionParent.targetConnection != connectionChild &&
-            (!parent || parent == this)) {
-          if (connectionParent.targetConnection) {
-            connectionParent.disconnect();
-          }
-          connectionParent.connect(connectionChild);
-        }
-      }
+      Blockly.Mutator.reconnect(connections[i], this, 'ADD' + i);
     }
   },
   /**

diff --git a/blocks/logic.js b/blocks/logic.js
@@ -152,16 +152,10 @@ Blockly.Blocks['controls_if'] = {
     this.updateShape_();
     // Reconnect any child blocks.
     for (var i = 1; i <= this.elseifCount_; i++) {
-      if (valueConnections[i]) {
-        this.getInput('IF' + i).connection.connect(valueConnections[i]);
-      }
-      if (statementConnections[i]) {
-        this.getInput('DO' + i).connection.connect(statementConnections[i]);
-      }
-    }
-    if (elseStatementConnection) {
-      this.getInput('ELSE').connection.connect(elseStatementConnection);
+      Blockly.Mutator.reconnect(valueConnections[i], this, 'IF' + i);
+      Blockly.Mutator.reconnect(statementConnections[i], this, 'DO' + i);
     }
+    Blockly.Mutator.reconnect(elseStatementConnection, this, 'ELSE');
   },
   /**
    * Store pointers to any connected child blocks.

diff --git a/blocks/text.js b/blocks/text.js
@@ -141,9 +141,7 @@ Blockly.Blocks['text_join'] = {
     this.updateShape_();
     // Reconnect any child blocks.
     for (var i = 0; i < this.itemCount_; i++) {
-      if (connections[i]) {
-        this.getInput('ADD' + i).connection.connect(connections[i]);
-      }
+      Blockly.Mutator.reconnect(connections[i], this, 'ADD' + i);
     }
   },
   /**
@@ -168,28 +166,29 @@ Blockly.Blocks['text_join'] = {
    * @this Blockly.Block
    */
   updateShape_: function() {
-    // Delete everything.
-    if (this.getInput('EMPTY')) {
+    if (this.itemCount_ && this.getInput('EMPTY')) {
       this.removeInput('EMPTY');
-    } else {
-      var i = 0;
-      while (this.getInput('ADD' + i)) {
-        this.removeInput('ADD' + i);
-        i++;
-      }
+    } else if (!this.itemCount_ && !this.getInput('EMPTY')) {
+      this.appendDummyInput('EMPTY')
+          .appendField(this.newQuote_(true))
+          .appendField(this.newQuote_(false));
     }
-    // Rebuild block.
-    if (this.itemCount_ == 0) {
-      this.appendDummyInput('EMPTY');
-    } else {
-      for (var i = 0; i < this.itemCount_; i++) {
+    // Add new inputs.
+    for (var i = 0; i < this.itemCount_; i++) {
+      if (!this.getInput('ADD' + i)) {
         var input = this.appendValueInput('ADD' + i);
         if (i == 0) {
           input.appendField(Blockly.Msg.TEXT_JOIN_TITLE_CREATEWITH);
         }
       }
     }
-  }
+    // Remove deleted inputs.
+    while (this.getInput('ADD' + i)) {
+      this.removeInput('ADD' + i);
+      i++;
+    }
+  },
+  newQuote_: Blockly.Blocks['text'].newQuote_
 };
 
 Blockly.Blocks['text_create_join_container'] = {