Fix multiselect drag to backpack

appinventor/appengine/war/index.jsp

@@ -124,7 +124,7 @@
     <script type="text/javascript" src="static/js/workspace-search-9.1.10.min.js"></script>
     <script type="text/javascript" src="static/js/block-dynamic-connection-0.7.16.min.js"></script>
     <script type="text/javascript" src="static/js/pickr.min.js"></script>
-    <script type="text/javascript" src="static/js/workspace-multiselect-pr126-e813d3a.min.js"></script>
+    <script type="text/javascript" src="static/js/workspace-multiselect-pr134-c630b72.min.js"></script>
     <script type="text/javascript" src="static/js/keyboard-navigation-0.7.0.min.js"></script>
     <script type="text/javascript" src="<%= odeBase %>ode/cdnok.js"></script>
     <script type="text/javascript" src="static/js/jszip.min.js"></script>

appinventor/blocklyeditor/src/backpack.js

@@ -297,7 +297,7 @@ AI.Blockly.Backpack = class extends Blockly.DragTarget {
   }
 
   onDragEnter(e) {
-    if (e instanceof Blockly.BlockSvg) {
+    if (e instanceof Blockly.BlockSvg || e.toFlyoutInfo !== undefined) {
       // switch to open backpack icon
       this.setOpen_(true);
     }
@@ -312,6 +312,17 @@ AI.Blockly.Backpack = class extends Blockly.DragTarget {
     try {
       if (dragElement instanceof Blockly.BlockSvg) {
         this.addToBackpack(/** @type {!Blockly.BlockSvg} */ (dragElement), true);
+      } else if (dragElement.toFlyoutInfo !== undefined) {
+        const headlessWorkspace = new Blockly.Workspace();
+        headlessWorkspace.targetWorkspace = this.workspace_;
+        try {
+          for (const blockInfo of dragElement.toFlyoutInfo()) {
+            const tempBlock = Blockly.serialization.blocks.append(blockInfo, headlessWorkspace);
+            this.addToBackpack(tempBlock, true);
+          }
+        } finally {
+          headlessWorkspace.dispose();
+        }
       }
     } finally {
       this.setOpen_(false);
@@ -375,10 +386,10 @@ AI.Blockly.Backpack = class extends Blockly.DragTarget {
           if (contents === undefined || contents.length === 0) {
             return;
           }
-          let headlessWorkspace = null;
           let lastPastedBlock = null;
+          const headlessWorkspace = new Blockly.Workspace();
+          headlessWorkspace.targetWorkspace = this.workspace_;
           try {
-            headlessWorkspace = new Blockly.Workspace();
             Blockly.Events.setGroup(true);
             for (let i = 0; i < contents.length; i++) {
               const xml = Blockly.utils.xml.textToDom(contents[i]);

appinventor/blocklyeditor/src/block.js

@@ -179,3 +179,28 @@ Blockly.Block.prototype.domToMutation = null;
  */
 Blockly.Block.prototype.mutationToDom = null;
 
+/**
+ * Mark this block as bad.
+ */
+Blockly.Block.prototype.badBlock = function() {
+  this.isBad = true;
+};
+
+/**
+ * Unmark this block as bad.
+ */
+Blockly.Block.prototype.notBadBlock = function() {
+  this.isBad = false;
+};
+
+/**
+ * Get the top-most workspace. Typically this is the current workspace except for flyout/flydowns.
+ * @returns {!Blockly.Workspace}
+ */
+Blockly.Block.prototype.getTopWorkspace = function() {
+  var workspace = this.workspace;
+  while (workspace.targetWorkspace) {
+    workspace = workspace.targetWorkspace;
+  }
+  return workspace;
+};

appinventor/blocklyeditor/src/block_svg.js

@@ -107,7 +107,7 @@ Blockly.BlockSvg.prototype.isBadBlock = function() {
  * Mark this block as Bad.  Highlight it visually in Red.
  */
 Blockly.BlockSvg.prototype.badBlock = function() {
-  this.isBad = true;
+  Object.getPrototypeOf(Blockly.BlockSvg.prototype).badBlock.call(this);
   if (this.workspace == Blockly.common.getMainWorkspace()) {
     // mark a block bad only if it is on the main workspace
     if (!((typeof this.getSvgRoot()) == 'object' && this.getSvgRoot() != null)) {
@@ -121,7 +121,7 @@ Blockly.BlockSvg.prototype.badBlock = function() {
  * Unmark this block as Bad.
  */
 Blockly.BlockSvg.prototype.notBadBlock = function() {
-  this.isBad = false;
+  Object.getPrototypeOf(Blockly.BlockSvg.prototype).notBadBlock.call(this);
   if (this.workspace == Blockly.common.getMainWorkspace()) {
     // mark a block not bad only if it is on the main workspace
     if (!((typeof this.getSvgRoot()) == 'object' && this.getSvgRoot() != null)) {
@@ -154,16 +154,6 @@ Blockly.BlockSvg.prototype.dispose = (function(func) {
   }
 })(Blockly.BlockSvg.prototype.dispose);
 
-/**
- * Get the top-most workspace. Typically this is the current workspace except for flyout/flydowns.
- * @returns {!Blockly.WorkspaceSvg}
- */
-Blockly.BlockSvg.prototype.getTopWorkspace = function() {
-  var workspace = this.workspace;
-  while (workspace.targetWorkspace) workspace = workspace.targetWorkspace;
-  return workspace;
-};
-
 /**
  * Load the block's help page in a new window. This version overrides the implementation in Blockly
  * in order to include the locale query parameter that the documentation page will use to redirect

appinventor/blocklyeditor/src/blocks/components.js

@@ -266,8 +266,6 @@ Blockly.Blocks.component_event = {
     // used here due to a previous call to mutationToDom. Reusing the dropdown is not
     // allowed by Blockly, i.e. its sourceBlock is not allowed to be changed.
     this.componentDropDown = Blockly.ComponentBlock.createComponentDropDown(this);
-    var oldRendered = this.rendered;
-    this.rendered = false;
     var oldDo = null;
     for (var i = 0, input; input = this.inputList[i]; i++) {
       if (input.connection) {
@@ -347,16 +345,10 @@ Blockly.Blocks.component_event = {
       this.getInput('DO').connection.connect(oldDo.previousConnection);
     }
 
-    for (var i = 0, input; input = this.inputList[i]; i++) {
-      input.init();
-    }
-
     // Set as badBlock if it doesn't exist.
     this.verify();
     // Disable it if it does exist and is deprecated.
     Blockly.ComponentBlock.checkDeprecated(this, eventType);
-
-    this.rendered = oldRendered;
   },
 
   getTypeName: function() {
@@ -722,8 +714,6 @@ Blockly.Blocks.component_method = {
     // used here due to a previous call to mutationToDom. Reusing the dropdown is not
     // allowed by Blockly, i.e. its sourceBlock is not allowed to be changed.
     this.componentDropDown = Blockly.ComponentBlock.createComponentDropDown(this);
-    var oldRendered = this.rendered;
-    this.rendered = false;
     var oldInputValues = [];
     for (var i = 0, input; input = this.inputList[i]; i++) {
       if (input.connection) {
@@ -843,10 +833,6 @@ Blockly.Blocks.component_method = {
       }
     }
 
-    for (var i = 0, input; input = this.inputList[i]; i++) {
-      input.init();
-    }
-
     if (!methodTypeObject) {
       if (this.shape === 'statement') {
         this.setPreviousStatement(true);
@@ -877,8 +863,6 @@ Blockly.Blocks.component_method = {
     this.verify();
     // Disable it if it does exist and is deprecated.
     Blockly.ComponentBlock.checkDeprecated(this, this.getMethodTypeObject());
-
-    this.rendered = oldRendered;
   },
 
   getTypeName: function() {
@@ -1135,8 +1119,6 @@ Blockly.Blocks.component_set_get = {
   },
 
   domToMutation : function(xmlElement) {
-    var oldRendered = this.rendered;
-    this.rendered = false;
     var oldInput = this.setOrGet == "set" && this.getInputTargetBlock('VALUE');
     for (var i = 0, input; input = this.inputList[i]; i++) {
       if (input.connection) {
@@ -1255,7 +1237,6 @@ Blockly.Blocks.component_set_get = {
     }
 
     if (oldInput) {
-      this.getInput('VALUE').init();
       oldInput.outputConnection.reconnect(this, 'VALUE');
     }
 
@@ -1279,12 +1260,6 @@ Blockly.Blocks.component_set_get = {
     this.verify();
     // Disable it if it does exist and is deprecated.
     Blockly.ComponentBlock.checkDeprecated(this, this.propertyObject);
-
-    for (var i = 0, input; input = this.inputList[i]; i++) {
-      input.init();
-    }
-
-    this.rendered = oldRendered;
   },
 
   getTypeName: function() {

appinventor/blocklyeditor/src/blocks/lexical-variables.js

@@ -515,13 +515,6 @@ Blockly.Blocks['local_declaration_statement'] = {
       this.updateDeclarationInputs_(newLocalNames, initializers);
     }
   },
-  dispose: function() {
-    // *** [lyn, 11/07/12] Dunno if anything needs to be done here.
-    // Call parent's destructor.
-    Blockly.BlockSvg.prototype.dispose.apply(this, arguments);
-    // [lyn, 11/07/12] In above line, don't know where "arguments" param comes from,
-    // but if it's remove, there's no clicking sound upon deleting the block!
-  },
   saveConnections: function(containerBlock) {
     // Store child initializer blocks for local name declarations with name blocks in mutator editor
     var nameBlock = containerBlock.getInputTargetBlock('STACK');
@@ -706,7 +699,6 @@ Blockly.Blocks['local_declaration_expression'] = {
   blocksInScope: Blockly.Blocks.local_declaration_statement.blocksInScope,
   decompose: Blockly.Blocks.local_declaration_statement.decompose,
   compose: Blockly.Blocks.local_declaration_statement.compose,
-  dispose: Blockly.Blocks.local_declaration_statement.dispose,
   saveConnections: Blockly.Blocks.local_declaration_statement.saveConnections,
   getVars: Blockly.Blocks.local_declaration_statement.getVars,
   declaredNames: Blockly.Blocks.local_declaration_statement.declaredNames,

appinventor/blocklyeditor/src/blocks/procedures.js

@@ -374,7 +374,7 @@ Blockly.Blocks['procedures_defnoreturn'] = {
     }
 
     // Call parent's destructor.
-    Blockly.BlockSvg.prototype.dispose.apply(this, arguments);
+    Object.getPrototypeOf(this).dispose.apply(this, arguments);
 
     var procDb = workspace.getProcedureDatabase();
     if (editable && procDb && workspace == Blockly.common.getMainWorkspace()) {
@@ -784,7 +784,7 @@ Blockly.Blocks['procedures_defanonnoreturn'] = {
     }
   },
   dispose: function() {
-    Blockly.BlockSvg.prototype.dispose.apply(this, arguments);
+    Object.getPrototypeOf(this).dispose.apply(this, arguments);
   },
   getVars: Blockly.Blocks.procedures_defnoreturn.getVars,
   declaredNames: Blockly.Blocks.procedures_defnoreturn.declaredNames,

appinventor/blocklyeditor/tests/com/google/appinventor/mocha/index.html

@@ -14,7 +14,7 @@
     <script src="../../../../../../appengine/war/static/js/workspace-search-9.1.10.min.js"></script>
     <script src="../../../../../../appengine/war/static/js/block-dynamic-connection-0.7.16.min.js"></script>
     <script src="../../../../../../appengine/war/static/js/blockly-field-colour-5.0.19.min.js"></script>
-    <script src="../../../../../../appengine/war/static/js/workspace-multiselect-pr126-e813d3a.min.js"></script>
+    <script src="../../../../../../appengine/war/static/js/workspace-multiselect-pr134-c630b72.min.js"></script>
     <script src="../../../../../../blocklyeditor/tests/testCommon.js"></script>
     <!--<script src="../../../../../../blocklyeditor/src/msg/en/_messages.js"></script>-->
 </head>

appinventor/karma.conf.js

@@ -24,7 +24,7 @@ module.exports = function(config) {
       'appengine/war/static/js/workspace-search-9.1.10.min.js',
       'appengine/war/static/js/block-dynamic-connection-0.7.16.min.js',
       'appengine/war/static/js/blockly-field-colour-5.0.19.min.js',
-      'appengine/war/static/js/workspace-multiselect-pr126-e813d3a.min.js',
+      'appengine/war/static/js/workspace-multiselect-pr134-c630b72.min.js',
       'blocklyeditor/tests/testCommon.js',
       'blocklyeditor/tests/com/google/appinventor/mocha/*.js',
       'blocklyeditor/build/javascript/*.js',