Merge branch 'develop' into develop-builds

Author: CubesterYT

core/block.js

@@ -654,10 +654,14 @@ Blockly.Block.prototype.isShadow = function() {
 
 /**
  * Set whether this block is a shadow block or not.
- * @param {boolean} shadow True if a shadow.
+ * @param {boolean} newBoolean True if a shadow.
  */
-Blockly.Block.prototype.setShadow = function(shadow) {
-  this.isShadow_ = shadow;
+Blockly.Block.prototype.setShadow = function(newBoolean) {
+  if (this.isShadow_ != newBoolean) {
+    Blockly.Events.fire(new Blockly.Events.BlockChange(
+        this, 'shadow', null, this.isShadow_, newBoolean));
+    this.isShadow_ = newBoolean;
+  }
 };
 
 /**

core/block_events.js

@@ -191,6 +191,9 @@ Blockly.Events.Change.prototype.run = function(forward) {
     case 'inline':
       block.setInputsInline(value);
       break;
+    case 'shadow':
+      block.setShadow(value);
+      break;
     case 'mutation':
       var oldMutation = '';
       if (block.mutationToDom) {

core/block_svg.js

@@ -825,6 +825,11 @@ Blockly.BlockSvg.prototype.setEditable = function(editable) {
 Blockly.BlockSvg.prototype.setShadow = function(shadow) {
   Blockly.BlockSvg.superClass_.setShadow.call(this, shadow);
   this.updateColour();
+
+  if (this.rendered) {
+    this.render();
+    this.bumpNeighbours_();
+  }
 };
 
 /**

core/field_checkbox.js

@@ -172,6 +172,8 @@ Blockly.FieldCheckbox.prototype.showEditor_ = function() {
   }
   // Remove the shadow dom from the connection. (to prevent regeneration)
   input.connection.setShadowDom();
+  // Un-shadow the block so the VM will properly delete it.
+  source.setShadow(false);
   // Dispose of our shadow parent.
   source.unplug(false);
   source.dispose(false, false);