Merge pull request #1 from tmickel/merge-fixes

Merge fixes

core/field_iconmenu.js

@@ -121,7 +121,10 @@ Blockly.FieldIconMenu.prototype.setValue = function(newValue) {
  * @private
  */
 Blockly.FieldIconMenu.prototype.setParentFieldImage = function(src) {
-  if (this.sourceBlock_) {
+  // Only attempt if we have a set sourceBlock_ and parentBlock_
+  // It's possible that this function could be called before
+  // a parent block is set; in that case, fail silently.
+  if (this.sourceBlock_ && this.sourceBlock_.parentBlock_) {
     var parentBlock = this.sourceBlock_.parentBlock_;
     // Loop through all inputs' fields to find the first FieldImage
     for (var i = 0, input; input = parentBlock.inputList[i]; i++) {

core/flyout.js

@@ -1036,7 +1036,7 @@ Blockly.Flyout.prototype.placeNewBlock_ = function(originBlock, workspace) {
 
   // Create the new block by cloning the block in the flyout (via XML).
   var xml = Blockly.Xml.blockToDom(originBlock);
-  var block = Blockly.Xml.domToBlock(workspace, xml);
+  var block = Blockly.Xml.domToBlock(xml, workspace);
   var blockSvgNew = block.getSvgRoot();
   if (!blockSvgNew) {
     throw 'block is not rendered.';

core/workspace_svg.js

@@ -478,7 +478,7 @@ Blockly.WorkspaceSvg.prototype.highlightBlock = function(id) {
 Blockly.WorkspaceSvg.prototype.glowBlock = function(id, isGlowingBlock) {
   var block = null;
   if (id) {
-    block = Blockly.Block.getById(id);
+    block = this.getBlockById(id);
     if (!block) {
       throw 'Tried to glow block that does not exist.';
     }
@@ -494,7 +494,7 @@ Blockly.WorkspaceSvg.prototype.glowBlock = function(id, isGlowingBlock) {
 Blockly.WorkspaceSvg.prototype.glowStack = function(id, isGlowingStack) {
   var block = null;
   if (id) {
-    block = Blockly.Block.getById(id);
+    block = this.getBlockById(id);
     if (!block) {
       throw 'Tried to glow stack on block that does not exist.';
     }