Merge branch 'master' into develop

core/connection.js

@@ -180,8 +180,9 @@ Blockly.Connection.prototype.connect_ = function(childConnection) {
       // block.  Since this block may be a stack, walk down to the end.
       var newBlock = childBlock;
       while (newBlock.nextConnection) {
-        if (newBlock.nextConnection.isConnected()) {
-          newBlock = newBlock.getNextBlock();
+        var nextBlock = newBlock.getNextBlock();
+        if (nextBlock && !nextBlock.isShadow()) {
+          newBlock = nextBlock;
         } else {
           if (orphanBlock.previousConnection.checkType_(
               newBlock.nextConnection)) {
@@ -516,8 +517,6 @@ Blockly.Connection.prototype.disconnectInternal_ = function(parentBlock,
 
 /**
  * Respawn the shadow block if there was one connected to the this connection.
- * @return {Blockly.Block} The newly spawned shadow block, or null if none was
- *    spawned.
  * @private
  */
 Blockly.Connection.prototype.respawnShadow_ = function() {
@@ -533,9 +532,7 @@ Blockly.Connection.prototype.respawnShadow_ = function() {
     } else {
       throw 'Child block does not have output or previous statement.';
     }
-    return blockShadow;
   }
-  return null;
 };
 
 /**

core/rendered_connection.js

@@ -33,6 +33,7 @@ goog.require('Blockly.Connection');
  * Class for a connection between blocks that may be rendered on screen.
  * @param {!Blockly.Block} source The block establishing this connection.
  * @param {number} type The type of the connection.
+ * @extends {Blockly.Connection}
  * @constructor
  */
 Blockly.RenderedConnection = function(source, type) {
@@ -334,8 +335,8 @@ Blockly.RenderedConnection.prototype.respawnShadow_ = function() {
   // Respawn the shadow block if there is one.
   var shadow = this.getShadowDom();
   if (parentBlock.workspace && shadow && Blockly.Events.recordUndo) {
-    var blockShadow =
-        Blockly.RenderedConnection.superClass_.respawnShadow_.call(this);
+    Blockly.RenderedConnection.superClass_.respawnShadow_.call(this);
+    var blockShadow = this.targetBlock();
     if (!blockShadow) {
       throw 'Couldn\'t respawn the shadow block that should exist here.';
     }

tests/multi_playground.html

@@ -15,23 +15,19 @@
 <script src="../blocks/procedures.js"></script>
 <script>
 'use strict';
- // True if we're showing toolboxes, false if showing open flyouts.
- var showingToolbox = true;
- // The workspaces we're showing.
- var workspaces = [];
-
- var options = {
-  comments: false,
-  disable: false,
-  collapse: false,
+var options = {
+  comments: true,
+  disable: true,
+  collapse: true,
   maxBlocks: Infinity,
   media: '../media/',
   readOnly: false,
-  rtl: false,
+  //rtl: false,
   scrollbars: true,
   trashcan: true,
-  horizontalLayout: false,
-  toolboxPosition: 'start',
+  //toolbox: null,
+  //horizontalLayout: false,
+  //toolboxPosition: 'start',
   zoom: {
     controls: true,
     wheel: false,
@@ -39,54 +35,35 @@
     maxScale: 4,
     minScale: 0.25,
     scaleSpeed: 1.1
-    },
-  };
+  },
+};
 
-function start(toolboxId) {
-  startBlocklyInstance('VertStartLTR', false, false, 'start', toolboxId);
-  startBlocklyInstance('VertStartRTL', true, false, 'start', toolboxId);
+function start() {
+  var match = location.search.match(/toolbox=([^&]+)/);
+  var toolbox =
+      document.getElementById('toolbox-' + (match ? match[1] : 'categories'));
+  document.forms.options.elements.toolbox.selectedIndex =
+      Number(toolbox.getElementsByTagName('category').length == 0);
+  startBlocklyInstance('VertStartLTR', false, false, 'start', toolbox);
+  startBlocklyInstance('VertStartRTL', true, false, 'start', toolbox);
 
-  startBlocklyInstance('VertEndLTR', false, false, 'end', toolboxId);
-  startBlocklyInstance('VertEndRTL', true, false, 'end', toolboxId);
+  startBlocklyInstance('VertEndLTR', false, false, 'end', toolbox);
+  startBlocklyInstance('VertEndRTL', true, false, 'end', toolbox);
 
-  startBlocklyInstance('HorizontalStartLTR', false, true, 'start', toolboxId);
-  startBlocklyInstance('HorizontalStartRTL', true, true, 'start', toolboxId);
+  startBlocklyInstance('HorizontalStartLTR', false, true, 'start', toolbox);
+  startBlocklyInstance('HorizontalStartRTL', true, true, 'start', toolbox);
 
-  startBlocklyInstance('HorizontalEndLTR', false, true, 'end', toolboxId);
-  startBlocklyInstance('HorizontalEndRTL', true, true, 'end', toolboxId);
+  startBlocklyInstance('HorizontalEndLTR', false, true, 'end', toolbox);
+  startBlocklyInstance('HorizontalEndRTL', true, true, 'end', toolbox);
 }
 
 function startBlocklyInstance(suffix, rtl, horizontalLayout, position,
-  toolboxId) {
-  var toolbox = document.getElementById(toolboxId);
+    toolbox) {
   options.rtl = rtl;
   options.toolbox = toolbox;
   options.horizontalLayout = horizontalLayout;
   options.toolboxPosition = position;
-  workspaces.push(Blockly.inject('blocklyDiv' + suffix, options));
-}
-
-function swapFlyoutToolbox() {
-  var button = document.getElementById('swap');
-  var toolboxId;
-  if (showingToolbox) {
-    swap.textContent = 'Show toolboxes';
-    toolboxId = 'toolbox_alwaysOpen';
-  } else {
-    toolboxId = 'toolbox_categoriesScroll';
-    swap.textContent = 'Show flyouts';
-  }
-
-  // Dispose of all existing workspace stuff so
-  // we can repopulate.
-  for (var i = 0, ws; ws = workspaces[i]; i++) {
-   ws.dispose();
-  }
-  workspaces = [];
-
-  // Re-inject all the workspaces with new ids.
-  start(toolboxId);
-  showingToolbox = !showingToolbox;
+  Blockly.inject('blocklyDiv' + suffix, options);
 }
 </script>
 
@@ -102,86 +79,69 @@ h1 {
   font-weight: normal;
   font-size: 140%;
 }
-#blocklyDiv {
-  float: right;
-  height: 95%;
-  width: 70%;
+
+#octaweb {
+  width: 100%;
 }
-#collaborators {
-  float: right;
-  width: 30px;
-  margin-left: 10px;
+#octaweb th {
+  padding-top: 1em;
+  width: 50%;
 }
-#collaborators > img {
-  margin-right: 5px;
-  height: 30px;
-  padding-bottom: 5px;
-  width: 30px;
-  border-radius: 3px;
+#octaweb td {
+  width: 50%;
 }
-#importExport {
-  font-family: monospace;
-}
-#swap {
-  background-color: #4CAF50; /* Green */
-  color: white;
-  text-decoration: none;
-  font-size: 12px;
+#octaweb td div {
+  height: 480px;
+  width: 100%;
 }
 </style>
 </head>
-<body onload="start('toolbox_categoriesScroll')">
-  <div id="collaborators"></div>
-  <table>
+<body onload="start()">
+  <h1>Blockly Multi Playground</h1>
+
+  <form id="options">
+    <select name="toolbox" onchange="document.forms.options.submit()">
+      <option value="categories">Categories</option>
+      <option value="simple">Simple</option>
+    </select>
+  </form>
+
+  <table id="octaweb">
     <tr>
-      <td>
-        <button id="swap" type="button" valaue="Swap toolbox" onclick="swapFlyoutToolbox()">Show Flyouts</button>  
-      </td>
+      <th>LTR, Vertical, Start</th>
+      <th>RTL, Vertical, Start</th>
     </tr>
     <tr>
-      <td/>
-      <td>LTR</td>
-      <td>RTL</td>
+      <td><div id="blocklyDivVertStartLTR"></div></td>
+      <td><div id="blocklyDivVertStartRTL"></div></td>
     </tr>
     <tr>
-      <td>Vertical layout; toolbox at start</td>
-      <td>
-        <div id="blocklyDivVertStartLTR" style="height: 480px; width: 600px;"></div>
-      </td>
-      <td>
-        <div id="blocklyDivVertStartRTL" style="height: 480px; width: 600px;"></div>
-      </td>
+      <th>LTR, Vertical, End</th>
+      <th>RTL, Vertical, End</th>
     </tr>
     <tr>
-      <td>Vertical layout; toolbox at end</td>
-      <td>
-        <div id="blocklyDivVertEndLTR" style="height: 480px; width: 600px;"></div>
-      </td>
-      <td>
-        <div id="blocklyDivVertEndRTL" style="height: 480px; width: 600px;"></div>
-      </td>
+      <td><div id="blocklyDivVertEndLTR"></div></td>
+      <td><div id="blocklyDivVertEndRTL"></div></td>
     </tr>
     <tr>
-      <td>Horizontal layout; toolbox at start</td>
-      <td>
-        <div id="blocklyDivHorizontalStartLTR" style="height: 480px; width: 600px;"></div>
-      </td>
-      <td>
-        <div id="blocklyDivHorizontalStartRTL" style="height: 480px; width: 600px;"></div>
-      </td>
+      <th>LTR, Horizontal, Start</th>
+      <th>RTL, Horizontal, Start</th>
     </tr>
     <tr>
-      <td>Horizontal layout; toolbox at end</td>
-      <td>
-        <div id="blocklyDivHorizontalEndLTR" style="height: 480px; width: 600px;"></div>
-      </td>
-      <td>
-        <div id="blocklyDivHorizontalEndRTL" style="height: 480px; width: 600px;"></div>
-      </td>
+      <td><div id="blocklyDivHorizontalStartLTR"></div></td>
+      <td><div id="blocklyDivHorizontalStartRTL"></div></td>
+    </tr>
+    <tr>
+      <th>LTR, Horizontal, End</th>
+      <th>RTL, Horizontal, End</th>
+    </tr>
+    <tr>
+      <td><div id="blocklyDivHorizontalEndLTR"></div></td>
+      <td><div id="blocklyDivHorizontalEndRTL"></div></td>
     </tr>
   </table>
 
-  <xml id="toolbox_alwaysOpen" style="display: none">
+  <xml id="toolbox-simple" style="display: none">
     <block type="controls_if"></block>
     <block type="logic_compare"></block>
     <!-- <block type="control_repeat"></block> -->
@@ -200,8 +160,8 @@ h1 {
     <block type="logic_ternary"></block>
   </xml>
 
-  <xml id="toolbox_categoriesScroll" style="display: none">
-     <category name="Logic" colour="210">
+  <xml id="toolbox-categories" style="display: none">
+    <category name="Logic" colour="210">
       <block type="controls_if"></block>
       <block type="logic_compare"></block>
       <block type="logic_operation"></block>
@@ -460,6 +420,7 @@ h1 {
           </shadow>
         </value>
       </block>
+      <block type="lists_sort"></block>
     </category>
     <category name="Colour" colour="20">
       <block type="colour_picker"></block>

tests/playground.html

@@ -60,13 +60,23 @@
 <script src="../blocks/procedures.js"></script>
 <script>
 'use strict';
-// Depending on the URL argument, render as LTR or RTL.
-var rtl = (document.location.search == '?rtl');
 var workspace = null;
 var fakeDragStack = [];
 
 function start() {
-  var toolbox = document.getElementById('toolbox');
+  // Parse the URL arguments.
+  var match = location.search.match(/dir=([^&]+)/);
+  var rtl = match && match[1] == 'rtl';
+  document.forms.options.elements.dir.selectedIndex = Number(rtl);
+  var match = location.search.match(/toolbox=([^&]+)/);
+  var toolbox =
+      document.getElementById('toolbox-' + (match ? match[1] : 'categories'));
+  document.forms.options.elements.toolbox.selectedIndex =
+      Number(toolbox.getElementsByTagName('category').length == 0);
+  match = location.search.match(/side=([^&]+)/);
+  var side = match ? match[1] : 'start';
+  document.forms.options.elements.side.value = side;
+  // Create main workspace.
   workspace = Blockly.inject('blocklyDiv',
           {comments: true,
            disable: true,
@@ -76,12 +86,14 @@ function start() {
               length: 3,
               colour: '#ccc',
               snap: true},
+           horizontalLayout: side == 'top' || side == 'bottom',
            maxBlocks: Infinity,
            media: '../media/',
            readOnly: false,
            rtl: rtl,
            scrollbars: true,
            toolbox: toolbox,
+           toolboxPosition: side == 'top' || side == 'start' ? 'start' : 'end',
            zoom:
              {controls: true,
               wheel: true,
@@ -310,7 +322,78 @@ h1 {
 
   <div id="blocklyDiv"></div>
 
-  <xml id="toolbox" style="display: none">
+  <h1>Blockly Playground</h1>
+
+  <p><a href="javascript:void(workspace.setVisible(true))">Show</a>
+   - <a href="javascript:void(workspace.setVisible(false))">Hide</a></p>
+
+  <form id="options">
+    <select name="dir" onchange="document.forms.options.submit()">
+      <option value="ltr">LTR</option>
+      <option value="rtl">RTL</option>
+    </select>
+    <select name="toolbox" onchange="document.forms.options.submit()">
+      <option value="categories">Categories</option>
+      <option value="simple">Simple</option>
+    </select>
+    <select name="side" onchange="document.forms.options.submit()">
+      <option value="start">Start</option>
+      <option value="end">End</option>
+      <option value="top">Top</option>
+      <option value="bottom">Bottom</option>
+    </select>
+  </form>
+
+  <p>
+    <input type="button" value="Export to XML" onclick="toXml()">
+    &nbsp;
+    <input type="button" value="Import from XML" onclick="fromXml()" id="import">
+    <br>
+    <input type="button" value="To JavaScript" onclick="toCode('JavaScript')">
+    &nbsp;
+    <input type="button" value="To Python" onclick="toCode('Python')">
+    &nbsp;
+    <input type="button" value="To PHP" onclick="toCode('PHP')">
+    &nbsp;
+    <input type="button" value="To Lua" onclick="toCode('Lua')">
+    &nbsp;
+    <input type="button" value="To Dart" onclick="toCode('Dart')">
+    <br>
+    <textarea id="importExport" style="width: 26%; height: 12em"
+      onchange="taChange();" onkeyup="taChange()"></textarea>
+  </p>
+
+  <p>
+    Stress test: &nbsp;
+    <input type="button" value="Airstrike!" onclick="airstrike(100)">
+    <input type="button" value="Spaghetti!" onclick="spaghetti(8)">
+    <input type="button" value="Fake some drags!" onclick="fakeManyDrags()">
+  </p>
+  <p>
+    Log events: &nbsp;
+    <input type="checkbox" onclick="logEvents(this.checked)" id="logCheck">
+  </p>
+
+  <xml id="toolbox-simple" style="display: none">
+    <block type="controls_if"></block>
+    <block type="logic_compare"></block>
+    <!-- <block type="control_repeat"></block> -->
+    <block type="logic_operation"></block>
+    <block type="controls_repeat_ext">
+      <value name="TIMES">
+        <shadow type="math_number">
+          <field name="NUM">10</field>
+        </shadow>
+      </value>
+    </block>
+    <block type="logic_operation"></block>
+    <block type="logic_negate"></block>
+    <block type="logic_boolean"></block>
+    <block type="logic_null" disabled="true"></block>
+    <block type="logic_ternary"></block>
+  </xml>
+
+  <xml id="toolbox-categories" style="display: none">
     <category name="Logic" colour="210">
       <block type="controls_if"></block>
       <block type="logic_compare"></block>
@@ -614,49 +697,5 @@ h1 {
     <category name="Variables" colour="330" custom="VARIABLE"></category>
     <category name="Functions" colour="290" custom="PROCEDURE"></category>
   </xml>
-
-  <h1>Blockly Playground</h1>
-
-  <p><a href="javascript:void(workspace.setVisible(true))">Show</a>
-   - <a href="javascript:void(workspace.setVisible(false))">Hide</a></p>
-
-  <script>
-    if (rtl) {
-      document.write('[ &larr; RTL. Switch to <A HREF="?ltr">LTR</A>. ]');
-    } else {
-      document.write('[ &rarr; LTR. Switch to <A HREF="?rtl">RTL</A>. ]');
-    }
-  </script>
-
-  <p>
-    <input type="button" value="Export to XML" onclick="toXml()">
-    &nbsp;
-    <input type="button" value="Import from XML" onclick="fromXml()" id="import">
-    <br>
-    <input type="button" value="To JavaScript" onclick="toCode('JavaScript')">
-    &nbsp;
-    <input type="button" value="To Python" onclick="toCode('Python')">
-    &nbsp;
-    <input type="button" value="To PHP" onclick="toCode('PHP')">
-    &nbsp;
-    <input type="button" value="To Lua" onclick="toCode('Lua')">
-    &nbsp;
-    <input type="button" value="To Dart" onclick="toCode('Dart')">
-    <br>
-    <textarea id="importExport" style="width: 26%; height: 12em"
-      onchange="taChange();" onkeyup="taChange()"></textarea>
-  </p>
-
-  <p>
-    Stress test: &nbsp;
-    <input type="button" value="Airstrike!" onclick="airstrike(100)">
-    <input type="button" value="Spaghetti!" onclick="spaghetti(8)">
-    <input type="button" value="Fake some drags!" onclick="fakeManyDrags()">
-  </p>
-  <p>
-    Log events: &nbsp;
-    <input type="checkbox" onclick="logEvents(this.checked)" id="logCheck">
-  </p>
-
 </body>
 </html>