Run Blockly migration script

Change-Id: Id5fa531daa6c08fd8d38fa23dcf928f4253b07a2

Author: ewpatton

appinventor/blocklyeditor/src/backpack.js

@@ -188,7 +188,7 @@ Blockly.Backpack.backPackId = false;
  * @return {!Element} The backpack's SVG group.
  */
 Blockly.Backpack.prototype.createDom = function(opt_workspace) {
-  var workspace = opt_workspace || Blockly.getMainWorkspace();
+  var workspace = opt_workspace || Blockly.common.getMainWorkspace();
   // insert the flyout after the main workspace (except, there's no
   // svg.insertAfter method, so we need to insert before the thing following
   // the main workspace. Neil Fraser says: this is "less hacky than it looks".
@@ -200,8 +200,8 @@ Blockly.Backpack.prototype.createDom = function(opt_workspace) {
     workspace.getParentSvg().appendChild(flyoutGroup);
   }
 
-  this.svgGroup_ = Blockly.utils.createSvgElement('g', {}, null);
-  this.svgBody_ = Blockly.utils.createSvgElement('image',
+  this.svgGroup_ = Blockly.utils.dom.createSvgElement('g', {}, null);
+  this.svgBody_ = Blockly.utils.dom.createSvgElement('image',
       {'width': this.WIDTH_, 'height': this.BODY_HEIGHT_},
       this.svgGroup_);
   this.svgBody_.setAttributeNS('http://www.w3.org/1999/xlink', 'xlink:href',
@@ -218,16 +218,16 @@ Blockly.Backpack.prototype.createDom = function(opt_workspace) {
 Blockly.Backpack.prototype.init = function() {
   this.position_();
   // If the document resizes, reposition the backpack.
-  Blockly.bindEvent_(window, 'resize', this, this.position_);
+  Blockly.browserEvents.bind(window, 'resize', this, this.position_);
   // Fixes a bug in Firefox where the backpack cannot be opened.
-  Blockly.bindEvent_(this.svgBody_, 'mousedown', this, function(e) { e.stopPropagation(); e.preventDefault(); });
-  Blockly.bindEvent_(this.svgBody_, 'click', this, this.openBackpack);
-  Blockly.bindEvent_(this.svgBody_, 'contextmenu', this, this.openBackpackMenu);
+  Blockly.browserEvents.bind(this.svgBody_, 'mousedown', this, function(e) { e.stopPropagation(); e.preventDefault(); });
+  Blockly.browserEvents.bind(this.svgBody_, 'click', this, this.openBackpack);
+  Blockly.browserEvents.bind(this.svgBody_, 'contextmenu', this, this.openBackpackMenu);
   this.flyout_.init(this.workspace_);
   this.flyout_.workspace_.isBackpack = true;
 
   // load files for sound effect
-  Blockly.getMainWorkspace().loadAudio_(['static/media/backpack.mp3', 'static/media/backpack.ogg', 'static/media/backpack.wav'], 'backpack');
+  Blockly.common.getMainWorkspace().getAudioManager().load(['static/media/backpack.mp3', 'static/media/backpack.ogg', 'static/media/backpack.wav'], 'backpack');
 
   var p = this;
   this.getContents(function(contents) {
@@ -317,7 +317,7 @@ Blockly.Backpack.prototype.checkValidBlockTypes = function(block, arr) {
  *
  */
 Blockly.Backpack.prototype.addAllToBackpack = function() {
-  var topBlocks = Blockly.mainWorkspace.getTopBlocks(false);
+  var topBlocks = Blockly.common.getMainWorkspace().getTopBlocks(false);
   var p = this;
   this.getContents(function(contents) {
     var saveAsync = p.NoAsync_;
@@ -361,7 +361,7 @@ Blockly.Backpack.prototype.addToBackpack = function(block, store) {
     // storage in the future.
     p.setContents(bp_contents, store);
     p.grow();
-    Blockly.getMainWorkspace().playAudio('backpack');
+    Blockly.common.getMainWorkspace().playAudio('backpack');
 
     // update the flyout when it's visible
     if (p.flyout_.isVisible()) {
@@ -448,8 +448,8 @@ Blockly.Backpack.prototype.openBackpackMenu = function(e) {
   var backpackClear = {enabled: true};
   backpackClear.text = Blockly.Msg.BACKPACK_EMPTY;
   backpackClear.callback = function() {
-    if (Blockly.getMainWorkspace().hasBackpack()) {
-      Blockly.getMainWorkspace().getBackpack().clear();
+    if (Blockly.common.getMainWorkspace().hasBackpack()) {
+      Blockly.common.getMainWorkspace().getBackpack().clear();
     }
   };
   options.push(backpackClear);
@@ -492,10 +492,10 @@ Blockly.Backpack.prototype.openBackpack = function(e) {
  * @param {!goog.math.Coordinate} start coordinate of the mouseDown event
  */
 Blockly.Backpack.prototype.onMouseUp = function(e, start){
-  var xy = Blockly.selected.getRelativeToSurfaceXY();
+  var xy = Blockly.common.getSelected().getRelativeToSurfaceXY();
   var diffXY = goog.math.Coordinate.difference(start, xy);
-  Blockly.selected.moveBy(diffXY.x, diffXY.y);
-  Blockly.getMainWorkspace().render();
+  Blockly.common.getSelected().moveBy(diffXY.x, diffXY.y);
+  Blockly.common.getMainWorkspace().render();
 };
 
 /**
@@ -521,7 +521,7 @@ Blockly.Backpack.prototype.onMouseMove = function(e) {
 };
 
 Blockly.Backpack.prototype.mouseIsOver = function(e) {
-  var xy = Blockly.convertCoordinates(Blockly.getMainWorkspace(), e.clientX, e.clientY, true);
+  var xy = Blockly.convertCoordinates(Blockly.common.getMainWorkspace(), e.clientX, e.clientY, true);
   var mouseX = xy.x;
   var mouseY = xy.y;
   return (mouseX > this.left_) &&

appinventor/blocklyeditor/src/backpackFlyout.js

@@ -59,11 +59,11 @@ Blockly.BackpackFlyout.prototype.createDom = function(tagName) {
  */
 Blockly.BackpackFlyout.prototype.dispose = function() {
   this.hide();
-  Blockly.unbindEvent_(this.eventWrappers_);
+  Blockly.browserEvents.unbind(this.eventWrappers_);
   this.eventWrappers_.length = 0;
-  if (this.scrollbar_) {
-    this.scrollbar_.dispose();
-    this.scrollbar_ = null;
+  if (this.scrollbar) {
+    this.scrollbar.dispose();
+    this.scrollbar = null;
   }
   this.workspace_ = null;
   if (this.svgGroup_) {
@@ -90,11 +90,11 @@ Blockly.BackpackFlyout.prototype.isBlockCreatable_ = function(_block) {
  */
 Blockly.BackpackFlyout.terminateDrag_ = function() {
   if (Blockly.BackpackFlyout.onMouseUpWrapper_) {
-    Blockly.unbindEvent_(Blockly.BackpackFlyout.onMouseUpWrapper_);
+    Blockly.browserEvents.unbind(Blockly.BackpackFlyout.onMouseUpWrapper_);
     Blockly.BackpackFlyout.onMouseUpWrapper_ = null;
   }
   if (Blockly.BackpackFlyout.onMouseMoveWrapper_) {
-    Blockly.unbindEvent_(Blockly.BackpackFlyout.onMouseMoveWrapper_);
+    Blockly.browserEvents.unbind(Blockly.BackpackFlyout.onMouseMoveWrapper_);
     Blockly.BackpackFlyout.onMouseMoveWrapper_ = null;
   }
   Blockly.BackpackFlyout.startDownEvent_ = null;

appinventor/blocklyeditor/src/block_svg.js

@@ -83,7 +83,7 @@ Blockly.BlockSvg.prototype.onMouseDown_ = (function(func) {
         workspace.getParentSvg().parentNode.focus();
       }
       if (Blockly.FieldFlydown.openFieldFlydown_) {
-        var flydown = Blockly.getMainWorkspace().getFlydown();
+        var flydown = Blockly.common.getMainWorkspace().getFlydown();
         if (flydown) {
           if (goog.dom.contains(flydown.svgGroup_, this.svgGroup_)) {
             //prevent hiding the flyout if a child block is the target
@@ -225,7 +225,7 @@ Blockly.BlockSvg.prototype.renderDown_ = function() {
  */
 Blockly.BlockSvg.prototype.renderHere_ = function() {
   var start = new Date().getTime();
-  Blockly.Field.startCache();
+  Blockly.utils.dom.startTextWidthCache();
   this.rendered = true;
 
   if (this.isCollapsed()) {
@@ -258,7 +258,7 @@ Blockly.BlockSvg.prototype.renderHere_ = function() {
     this.removeBadBlock();
   }
 
-  Blockly.Field.stopCache();
+  Blockly.utils.dom.stopTextWidthCache();
   var stop = new Date().getTime();
   var timeDiff = stop-start;
   Blockly.Instrument.stats.renderHereCalls++;
@@ -348,7 +348,7 @@ Blockly.BlockSvg.prototype.setCollapsed = (function(func) {
  */
 Blockly.BlockSvg.prototype.addBadBlock = function() {
   if (this.rendered) {
-    Blockly.utils.addClass(/** @type {!Element} */ (this.svgGroup_),
+    Blockly.utils.dom.addClass(/** @type {!Element} */ (this.svgGroup_),
                            'badBlock');
     // Move the selected block to the top of the stack.
     this.svgGroup_.parentNode.appendChild(this.svgGroup_);
@@ -360,7 +360,7 @@ Blockly.BlockSvg.prototype.addBadBlock = function() {
  */
 Blockly.BlockSvg.prototype.removeBadBlock = function() {
   if (this.rendered) {
-    Blockly.utils.removeClass(/** @type {!Element} */ (this.svgGroup_),
+    Blockly.utils.dom.removeClass(/** @type {!Element} */ (this.svgGroup_),
                               'badBlock');
     // Move the selected block to the top of the stack.
     this.svgGroup_.parentNode.appendChild(this.svgGroup_);
@@ -371,7 +371,7 @@ Blockly.BlockSvg.prototype.removeBadBlock = function() {
  * Check to see if the block is marked as bad.
  */
 Blockly.BlockSvg.prototype.isBadBlock = function() {
-  return Blockly.utils.hasClass(/** @type {!Element} */ (this.svgGroup_),
+  return Blockly.utils.dom.hasClass(/** @type {!Element} */ (this.svgGroup_),
     'badBlock');
 };
 
@@ -380,7 +380,7 @@ Blockly.BlockSvg.prototype.isBadBlock = function() {
  */
 Blockly.BlockSvg.prototype.badBlock = function() {
   this.isBad = true;
-  if (this.workspace == Blockly.getMainWorkspace()) {
+  if (this.workspace == Blockly.common.getMainWorkspace()) {
     // mark a block bad only if it is on the main workspace
     goog.asserts.assertObject(this.svgGroup_, 'Block is not rendered.');
     this.addBadBlock();
@@ -392,7 +392,7 @@ Blockly.BlockSvg.prototype.badBlock = function() {
  */
 Blockly.BlockSvg.prototype.notBadBlock = function() {
   this.isBad = false;
-  if (this.workspace == Blockly.getMainWorkspace()) {
+  if (this.workspace == Blockly.common.getMainWorkspace()) {
     // mark a block not bad only if it is on the main workspace
     goog.asserts.assertObject(this.svgGroup_, 'Block is not rendered.');
     this.removeBadBlock();
@@ -518,7 +518,7 @@ Blockly.BlockSvg.prototype.getTopWorkspace = function() {
  * Add the selection highlight to the block.
  */
 Blockly.BlockSvg.prototype.addSelect = function() {
-  Blockly.utils.addClass(this.svgGroup_, 'blocklySelected');
+  Blockly.utils.dom.addClass(this.svgGroup_, 'blocklySelected');
   var block_0 = this;
   do {
     var root = block_0.getSvgRoot();

appinventor/blocklyeditor/src/blockly.js

@@ -42,7 +42,7 @@ Blockly.hideChaff = (function(func) {
       var argCopy = Array.prototype.slice.call(arguments);
       func.apply(this, argCopy);
       // [lyn, 10/06/13] for handling parameter & procedure flydowns
-      Blockly.WorkspaceSvg.prototype.hideChaff.call(Blockly.getMainWorkspace(), argCopy);
+      Blockly.WorkspaceSvg.prototype.hideChaff.call(Blockly.common.getMainWorkspace(), argCopy);
     };
     f.isWrapped = true;
     return f;
@@ -57,11 +57,11 @@ Blockly.hideChaff = (function(func) {
 Blockly.confirmDeletion = function(callback) {
   var DELETION_THRESHOLD = 3;
 
-  var descendantCount = Blockly.mainWorkspace.getAllBlocks().length;
-  if (Blockly.selected != null) {
-    descendantCount = Blockly.selected.getDescendants().length;
-    if (Blockly.selected.nextConnection && Blockly.selected.nextConnection.targetConnection) {
-      descendantCount -= Blockly.selected.nextConnection.targetBlock().getDescendants().length;
+  var descendantCount = Blockly.common.getMainWorkspace().getAllBlocks().length;
+  if (Blockly.common.getSelected() != null) {
+    descendantCount = Blockly.common.getSelected().getDescendants().length;
+    if (Blockly.common.getSelected().nextConnection && Blockly.common.getSelected().nextConnection.targetConnection) {
+      descendantCount -= Blockly.common.getSelected().nextConnection.targetBlock().getDescendants().length;
     }
   }
 
@@ -74,7 +74,7 @@ Blockly.confirmDeletion = function(callback) {
       var dialog = new Blockly.Util.Dialog(Blockly.Msg.CONFIRM_DELETE, msg, deleteButton, true, cancelButton, 0, function(button) {
         dialog.hide();
         if (button == deleteButton) {
-          Blockly.mainWorkspace.playAudio('delete');
+          Blockly.common.getMainWorkspace().playAudio('delete');
           callback(true);
         } else {
           callback(false);
@@ -83,13 +83,13 @@ Blockly.confirmDeletion = function(callback) {
     } else {
       var response = confirm(Blockly.Msg.WARNING_DELETE_X_BLOCKS.replace('%1', String(descendantCount)));
       if (response) {
-        Blockly.mainWorkspace.playAudio('delete');
+        Blockly.common.getMainWorkspace().playAudio('delete');
       }
       callback(response);
     }
   }
   else {
-    Blockly.mainWorkspace.playAudio('delete');
+    Blockly.common.getMainWorkspace().playAudio('delete');
     callback(true);
   }
 };

appinventor/blocklyeditor/src/blocklyeditor.js

@@ -232,7 +232,7 @@ Blockly.BlocklyEditor.addClearDoItOption = function(myBlock, options) {
   clearDoitOption.text = Blockly.Msg.CLEAR_DO_IT_ERROR;
   clearDoitOption.callback = function() {
     myBlock.replError = null;
-    Blockly.getMainWorkspace().getWarningHandler().checkErrors(myBlock);
+    Blockly.common.getMainWorkspace().getWarningHandler().checkErrors(myBlock);
   };
   options.push(clearDoitOption);
 };
@@ -429,7 +429,7 @@ Blockly.BlocklyEditor['create'] = function(container, formName, readOnly, rtl) {
  * @param {!Blockly.WorkspaceSvg} workspace
  */
 Blockly.ai_inject = function(container, workspace) {
-  Blockly.mainWorkspace = workspace;  // make workspace the 'active' workspace
+  Blockly.common.setMainWorkspace(workspace);  // make workspace the 'active' workspace
   workspace.fireChangeListener(new AI.Events.ScreenSwitch(workspace.projectId, workspace.formName));
   var gridEnabled = top.BlocklyPanel_getGridEnabled && top.BlocklyPanel_getGridEnabled();
   var gridSnap = top.BlocklyPanel_getSnapEnabled && top.BlocklyPanel_getSnapEnabled();
@@ -508,14 +508,14 @@ Blockly.ai_inject = function(container, workspace) {
   var flydown = new Blockly.Flydown(new Blockly.Options({scrollbars: false}));
   // ***** [lyn, 10/05/2013] NEED TO WORRY ABOUT MULTIPLE BLOCKLIES! *****
   workspace.flydown_ = flydown;
-  Blockly.utils.insertAfter_(flydown.createDom('g'), workspace.svgBubbleCanvas_);
+  Blockly.utils.dom.insertAfter(flydown.createDom('g'), workspace.getBubbleCanvas());
   flydown.init(workspace);
   flydown.autoClose = true; // Flydown closes after selecting a block
   workspace.addWarningIndicator();
   workspace.addBackpack();
   Blockly.init_(workspace);
   workspace.markFocused();
-  Blockly.bindEvent_(svg, 'focus', workspace, workspace.markFocused);
+  Blockly.browserEvents.bind(svg, 'focus', workspace, workspace.markFocused);
   workspace.resize();
   // Hide scrollbars by default (otherwise ghost rectangles intercept mouse events)
   workspace.flyout_.scrollbar_ && workspace.flyout_.scrollbar_.setContainerVisible(false);
@@ -595,7 +595,7 @@ top.document.addEventListener('mousedown', function(e) {
     target = target.parentElement;
   }
   // Make sure the workspace has been injected.
-  if (Blockly.mainWorkspace) {
+  if (Blockly.common.getMainWorkspace()) {
     Blockly.hideChaff();
   }
 }, false);

appinventor/blocklyeditor/src/component.js

@@ -71,8 +71,8 @@ Blockly.Component.rename = function(oldname, newname, uid) {
 
   console.log("Revised Blockly.ComponentInstances, Blockly.Language, Blockly.Yail for " + newname);
 
-  // Revise names, types, and block titles for all blocks containing newname in Blockly.mainWorkspace
-  var blocks = Blockly.mainWorkspace.getAllBlocks();
+  // Revise names, types, and block titles for all blocks containing newname in Blockly.common.getMainWorkspace()
+  var blocks = Blockly.common.getMainWorkspace().getAllBlocks();
   for (var x = 0, block; block = blocks[x]; x++) {
     if (!block.category) {
       continue;
@@ -81,7 +81,7 @@ Blockly.Component.rename = function(oldname, newname, uid) {
     }
   }
 
-  console.log("Revised Blockly.mainWorkspace for " + newname);
+  console.log("Revised Blockly.common.getMainWorkspace() for " + newname);
 };
 
 
@@ -92,7 +92,7 @@ Blockly.Component.rename = function(oldname, newname, uid) {
  * @param uid, Component's unique id -- not currently used
  *
  * The component should be listed in the ComponentInstances list.
- *   - For each instance of the component's block in the Blockly.mainWorkspace
+ *   - For each instance of the component's block in the Blockly.common.getMainWorkspace()
  *     -- Call its BlocklyBlock.destroy() method to remove the block
  *        from the workspace and adjust enclosed or enclosing blocks.
  * Remove the block's entry from ComponentInstances
@@ -103,7 +103,7 @@ Blockly.Component.remove = function(type, name, uid) {
   Blockly.TypeBlock.needsReload.components = true;
 
   // Delete instances of this type of block from the workspace
-  var allblocks = Blockly.mainWorkspace.getAllBlocks();
+  var allblocks = Blockly.common.getMainWorkspace().getAllBlocks();
   for (var x = 0, block; block = allblocks[x]; x++) {
     if (!block.category) {
       continue;
@@ -138,7 +138,7 @@ Blockly.Component.buildComponentMap = function(warnings, errors, forRepl, compil
 
   // TODO: populate warnings, errors as we traverse the top-level blocks
 
-  var blocks = Blockly.mainWorkspace.getTopBlocks(true);
+  var blocks = Blockly.common.getMainWorkspace().getTopBlocks(true);
   for (var x = 0, block; block = blocks[x]; x++) {
 
     // TODO: deal with unattached blocks that are not valid top-level definitions. Valid blocks
@@ -178,8 +178,8 @@ Blockly.Component.buildComponentMap = function(warnings, errors, forRepl, compil
  */
 Blockly.Component.verifyAllBlocks = function () {
   // We can only verify blocks once the workspace has been injected...
-  if (Blockly.mainWorkspace != null) {
-    var allBlocks = Blockly.mainWorkspace.getAllBlocks();
+  if (Blockly.common.getMainWorkspace() != null) {
+    var allBlocks = Blockly.common.getMainWorkspace().getAllBlocks();
     for (var x = 0, block; block = allBlocks[x]; ++x) {
       if (block.category != 'Component') {
         continue;

appinventor/blocklyeditor/src/drawer.js

@@ -62,7 +62,7 @@ Blockly.Drawer.PREFIX_ = 'cat_';
  */
 Blockly.Drawer.buildTree_ = function() {
   var tree = {};
-  var formName = Blockly.mainWorkspace.formName;
+  var formName = Blockly.common.getMainWorkspace().formName;
   var screenName = formName.substring(formName.indexOf("_") + 1);
 
   // Check to see if a Blocks Toolkit is defined. If so, use that to build the tree.
@@ -222,7 +222,7 @@ Blockly.Drawer.prototype.instanceRecordToXMLArray = function(instanceRecord) {
   var typeName = instanceRecord.typeName;
   var componentInfo = this.workspace_.getComponentDatabase().getType(typeName);
 
-  var formName = Blockly.mainWorkspace.formName;
+  var formName = Blockly.common.getMainWorkspace().formName;
   var screenName = formName.substring(formName.indexOf("_") + 1);
   var subsetJsonString = "";
   if (window.parent.BlocklyPanel_getComponentInstancePropertyValue) {