Bumped blockly source

ec4ab879168829fa20bea0b9e440350d20df47f4

Author: Ke, Mingze

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "webduino-blockly",
   "dependencies": {
-    "blockly-src": "google/blockly#217c7d7c8a37b2897409198cd05f99da85951d4b",
+    "blockly-src": "google/blockly#ec4ab879168829fa20bea0b9e440350d20df47f4",
     "webcomponentsjs": "0.x"
   }
 }

code.js

@@ -119,11 +119,11 @@ Code.loadBlocks = function(defaultXml) {
     // Language switching stores the blocks during the reload.
     delete window.sessionStorage.loadOnceBlocks;
     var xml = Blockly.Xml.textToDom(loadOnce);
-    Blockly.Xml.domToWorkspace(Code.workspace, xml);
+    Blockly.Xml.domToWorkspace(xml, Code.workspace);
   } else if (defaultXml) {
     // Load the editor with default starting blocks.
     var xml = Blockly.Xml.textToDom(defaultXml);
-    Blockly.Xml.domToWorkspace(Code.workspace, xml);
+    Blockly.Xml.domToWorkspace(xml, Code.workspace);
   } else if ('BlocklyStorage' in window) {
     // Restore saved blocks in a separate thread so that subsequent
     // initialization is not affected from a failed load.
@@ -438,7 +438,7 @@ Code.tabClick = function(clickedName) {
     }
     if (xmlDom) {
       Code.workspace.clear();
-      Blockly.Xml.domToWorkspace(Code.workspace, xmlDom);
+      Blockly.Xml.domToWorkspace(xmlDom, Code.workspace);
     }
   }
 
@@ -941,13 +941,30 @@ Blockly.WorkspaceSvg.prototype.showContextMenu_ = function(e) {
   }
   var menuOptions = [];
   var topBlocks = this.getTopBlocks(true);
+  var eventGroup = Blockly.genUid();
+
+  // Options to undo/redo previous action.
+  var undoOption = {};
+  undoOption.text = Blockly.Msg.UNDO;
+  undoOption.enabled = this.undoStack_.length > 0;
+  undoOption.callback = this.undo.bind(this, false);
+  menuOptions.push(undoOption);
+  var redoOption = {};
+  redoOption.text = Blockly.Msg.REDO;
+  redoOption.enabled = this.redoStack_.length > 0;
+  redoOption.callback = this.undo.bind(this, true);
+  menuOptions.push(redoOption);
+
   // Option to clean up blocks.
-  var cleanOption = {};
-  cleanOption.text = MSG.cleanUpBlocks;
-  cleanOption.enabled = topBlocks.length > 1;
-  cleanOption.callback = this.cleanUp_.bind(this);
-  menuOptions.push(cleanOption);
+  if (this.scrollbar) {
+    var cleanOption = {};
+    cleanOption.text = Blockly.Msg.CLEAN_UP;
+    cleanOption.enabled = topBlocks.length > 1;
+    cleanOption.callback = this.cleanUp_.bind(this);
+    menuOptions.push(cleanOption);
+  }
 
+  // Add download img option
   var imgOption = {};
   imgOption.text = MSG.exportImage;
   imgOption.enabled = topBlocks.length > 0;
@@ -1022,7 +1039,7 @@ Blockly.WorkspaceSvg.prototype.showContextMenu_ = function(e) {
     addDeletableBlocks(topBlocks[i]);
   }
   var deleteOption = {
-    text: deleteList.length <= 1 ? Blockly.Msg.DELETE_BLOCK :
+    text: deleteList.length == 1 ? Blockly.Msg.DELETE_BLOCK :
         Blockly.Msg.DELETE_X_BLOCKS.replace('%1', String(deleteList.length)),
     enabled: deleteList.length > 0,
     callback: function() {
@@ -1034,6 +1051,7 @@ Blockly.WorkspaceSvg.prototype.showContextMenu_ = function(e) {
     }
   };
   function deleteNext() {
+    Blockly.Events.setGroup(eventGroup);
     var block = deleteList.shift();
     if (block) {
       if (block.workspace) {
@@ -1043,6 +1061,7 @@ Blockly.WorkspaceSvg.prototype.showContextMenu_ = function(e) {
         deleteNext();
       }
     }
+    Blockly.Events.setGroup(false);
   }
   menuOptions.push(deleteOption);
 

components/blockly-src/.bower.json

@@ -1,12 +1,12 @@
 {
   "name": "blockly-src",
   "homepage": "https://github.com/google/blockly",
-  "_release": "217c7d7c8a",
+  "_release": "ec4ab87916",
   "_resolution": {
     "type": "commit",
-    "commit": "217c7d7c8a37b2897409198cd05f99da85951d4b"
+    "commit": "ec4ab879168829fa20bea0b9e440350d20df47f4"
   },
   "_source": "git://github.com/google/blockly.git",
-  "_target": "217c7d7c8a37b2897409198cd05f99da85951d4b",
+  "_target": "ec4ab879168829fa20bea0b9e440350d20df47f4",
   "_originalSource": "google/blockly"
 }

components/blockly-src/appengine/README.txt

@@ -30,6 +30,7 @@ blockly/
      |- blocks_compressed.js
      |- dart_compressed.js
      |- javascript_compressed.js
+     |- lua_compressed.js
      |- php_compressed.js
      `- python_compressed.js
 

components/blockly-src/appengine/storage.js

@@ -60,7 +60,7 @@ BlocklyStorage.restoreBlocks = function(opt_workspace) {
   if ('localStorage' in window && window.localStorage[url]) {
     var workspace = opt_workspace || Blockly.getMainWorkspace();
     var xml = Blockly.Xml.textToDom(window.localStorage[url]);
-    Blockly.Xml.domToWorkspace(workspace, xml);
+    Blockly.Xml.domToWorkspace(xml, workspace);
   }
 };
 
@@ -181,7 +181,7 @@ BlocklyStorage.loadXml_ = function(xml, workspace) {
   }
   // Clear the workspace to avoid merge.
   workspace.clear();
-  Blockly.Xml.domToWorkspace(workspace, xml);
+  Blockly.Xml.domToWorkspace(xml, workspace);
 };
 
 /**