Update to Blockly 13

appinventor/appengine/src/com/google/appinventor/client/editor/ProjectEditor.java

@@ -45,7 +45,7 @@ public abstract class ProjectEditor extends Composite {
   protected final long projectId;
   protected final Project project;
 
-  // Invariants: openFileEditors, fileIds, and deckPanel contain corresponding
+  // Invariants: fileIds and deckPanel contain corresponding
   // elements, i.e., if a FileEditor is in openFileEditors, its fileid should be
   // in fileIds and the FileEditor should be in deckPanel. If selectedFileEditor
   // is non-null, it is one of the file editors in openFileEditors and the
@@ -163,13 +163,22 @@ public final void buildScreenHashMap() {
    * @param beforeIndex  the index before which fileEditor will be inserted
    */
   public final void insertFileEditor(FileEditor fileEditor, int beforeIndex) {
-    String fileId = fileEditor.getFileId();
-    openFileEditors.put(fileId, fileEditor);
-    fileIds.add(beforeIndex, fileId);
+    fileIds.add(beforeIndex, fileEditor.getFileId());
     deckPanel.insert(fileEditor, beforeIndex);
     LOG.info("Inserted file editor for " + fileEditor.getFileId() + " at pos " + beforeIndex);
   }
 
+  /**
+   * Opens an inserted file editor.
+   *
+   * @param fileEditor  file editor to open
+   */
+  public final void openFileEditor(FileEditor fileEditor) {
+    String fileId = fileEditor.getFileId();
+    openFileEditors.put(fileId, fileEditor);
+    LOG.info("Opened file editor for " + fileEditor.getFileId());
+  }
+
   protected final void addFileEditorByType(FileEditor fileEditor) {
     String entityName = SourceNode.getEntityName(fileEditor.getFileId());
     if (!editorsByType.containsKey(entityName)) {

appinventor/appengine/src/com/google/appinventor/client/editor/blocks/BlocklyPanel.java

@@ -108,6 +108,10 @@ public interface BlocklyWorkspaceChangeListener {
   // My entity name
   private final String formName;
 
+  private final String projectId;
+
+  private final boolean readOnly;
+
   /**
    * Objects registered to listen for workspace changes.
    */
@@ -140,22 +144,9 @@ public BlocklyPanel(String formName, BlocksCodeGenerationTarget targetPlatform,
     getElement().addClassName("svg");
     getElement().setId(formName);
     this.formName = formName;
+    this.projectId = formName.split("_")[0];
+    this.readOnly = readOnly;
     this.targetPlatform = targetPlatform;
-    String projectId = formName.split("_")[0];
-
-    /* Blockly initialization now occurs in three stages. This is due to the fact that certain
-     * Blockly objects rely on SVG methods such as getScreenCTM(), which are not properly
-     * initialized and/or null prior to the svg element being attached to the DOM. The first
-     * stage of initialization happens here.
-     *
-     * Stages 2 and 3 can occur in different orders depending on network latency. On a fast
-     * connection, the second stage will be loading of the .bky content into the workspace.
-     * The third stage will then be rendering of the workspace when the user switches to the
-     * Blocks editor. On slow connections, the workspace may render blank until the blocks file
-     * has been downloaded from the server.
-     */
-    initWorkspace(projectId, readOnly, LocaleInfo.getCurrentLocale().isRTL(), targetPlatform.getTarget());
-
     LOG.info("Created BlocklyPanel for " + formName);
   }
 
@@ -722,12 +713,29 @@ private static native void exportMethodsToJavascript() /*-{
       $entry(@com.google.appinventor.client.editor.blocks.BlocklyPanel::getComponentContainerUuid(*));
   }-*/;
 
-  private native void initWorkspace(String projectId, boolean readOnly, boolean rtl, String targetLang)/*-{
+  /* Blockly initialization now occurs in three stages. This is due to the fact that certain
+   * Blockly objects rely on SVG methods such as getScreenCTM(), which are not properly
+   * initialized and/or null prior to the svg element being attached to the DOM. The first
+   * stage of initialization happens here.
+   *
+   * Stages 2 and 3 can occur in different orders depending on network latency. On a fast
+   * connection, the second stage will be loading of the .bky content into the workspace.
+   * The third stage will then be rendering of the workspace when the user switches to the
+   * Blocks editor. On slow connections, the workspace may render blank until the blocks file
+   * has been downloaded from the server.
+   */
+  public void initWorkspace() {
+    initWorkspace(LocaleInfo.getCurrentLocale().isRTL(), targetPlatform.getTarget());
+    LOG.info("Initialized Blockly workspace for " + formName);
+  }
+
+  private native void initWorkspace(boolean rtl, String targetLang)/*-{
     var el = this.@com.google.gwt.user.client.ui.UIObject::getElement()();
     var workspace = $wnd.Blockly.BlocklyEditor.create(el,
       this.@com.google.appinventor.client.editor.blocks.BlocklyPanel::formName,
-      readOnly, rtl, targetLang);
-    workspace.projectId = projectId;
+      this.@com.google.appinventor.client.editor.blocks.BlocklyPanel::readOnly,
+      rtl, targetLang);
+    workspace.projectId = this.@com.google.appinventor.client.editor.blocks.BlocklyPanel::projectId;
     var cb = $entry(this.@com.google.appinventor.client.editor.blocks.BlocklyPanel::workspaceChanged(Lcom/google/gwt/core/client/JavaScriptObject;));
     cb = cb.bind(this);
     workspace.addChangeListener(function(e) {

appinventor/appengine/src/com/google/appinventor/client/editor/blocks/BlocksEditor.java

@@ -128,16 +128,8 @@ public BlocksEditor(ProjectEditor projectEditor, S blocksNode, int systemVersion
     // New layouts don't need all this messing; see comments on selected answer at:
     // http://stackoverflow.com/questions/86901/creating-a-fluid-panel-in-gwt-to-fill-the-page
     initWidget(blocksArea);
-    blocksArea.populateComponentTypes(componentDatabase.getComponentsJSONString());
-
     // Get references to the source structure explorer
     sourceStructureExplorer = BlockSelectorBox.getBlockSelectorBox().getSourceStructureExplorer();
-
-    // Listen for selection events for built-in drawers
-    BlockSelectorBox.getBlockSelectorBox().addBlockDrawerSelectionListener(this);
-
-    designer = (T) projectEditor.getFileEditor(blocksNode.getEntityName(), DesignerEditor.EDITOR_TYPE);
-    formToBlocksEditor.put(entityName, this);
   }
 
   public abstract void prepareForUnload();
@@ -218,6 +210,17 @@ public boolean isLoaded() {
     return loadComplete;
   }
 
+  public void initWorkspace() {
+    blocksArea.initWorkspace();
+    blocksArea.populateComponentTypes(componentDatabase.getComponentsJSONString());
+
+    // Listen for selection events for built-in drawers
+    BlockSelectorBox.getBlockSelectorBox().addBlockDrawerSelectionListener(this);
+
+    designer = (T) projectEditor.getFileEditor(blocksNode.getEntityName(), DesignerEditor.EDITOR_TYPE);
+    formToBlocksEditor.put(entityName, this);
+  }
+
   public WorkspaceSvg getWorkspace() {
     return blocksArea.getWorkspace();
   }

appinventor/appengine/src/com/google/appinventor/client/editor/youngandroid/YaBlocksEditor.java

@@ -75,7 +75,11 @@ public final class YaBlocksEditor extends BlocksEditor<YoungAndroidBlocksNode, Y
     super(projectEditor, blocksNode, YaVersion.YOUNG_ANDROID_VERSION, YAIL,
         BlocksCodeGenerationTarget.YAIL,
         SimpleComponentDatabase.getInstance(blocksNode.getProjectId()));
+  }
 
+  @Override
+  public void initWorkspace() {
+    super.initWorkspace();
     project = Ode.getInstance().getProjectManager().getProject(blocksNode.getProjectId());
     project.addProjectChangeListener(this);
     onProjectLoaded(project);

appinventor/appengine/src/com/google/appinventor/client/editor/youngandroid/YaProjectEditor.java

@@ -249,12 +249,7 @@ public void execute() {
 
   public void addBlocksEditor(BlocksEditor<?, ?> editor) {
     String formName = editor.getEntityName();
-    int pos = Collections.binarySearch(fileIds, editor.getFileId(),
-        getFileIdComparator());
-    if (pos < 0) {
-      pos = -pos - 1;
-    }
-    insertFileEditor(editor, pos);
+    openFileEditor(editor);
     if (isLastOpened(formName)) {
       screen1BlocksLoaded = true;
       if (readyToShowScreen1()) {
@@ -295,8 +290,9 @@ private Promise<Object> loadProject(Object result) {
     }
     for (ProjectNode source: projectRootNode.getAllSourceNodes()) {
       if (source instanceof YoungAndroidBlocksNode) {
-        addBlocksEditor(((YoungAndroidBlocksNode) source).getFormName(),
-            new YaBlocksEditor(this, (YoungAndroidBlocksNode) source));
+        YaBlocksEditor newBlocksEditor = new YaBlocksEditor(this, (YoungAndroidBlocksNode) source);
+        addBlocksEditor(((YoungAndroidBlocksNode) source).getFormName(), newBlocksEditor);
+        newBlocksEditor.initWorkspace();
       }
     }
 
@@ -393,8 +389,9 @@ public void onProjectNodeAdded(Project project, ProjectNode node) {
     }
     else if (node instanceof YoungAndroidBlocksNode) {
       if (getFileEditor(node.getFileId()) == null) {
-        addBlocksEditor(((YoungAndroidBlocksNode) node).getEntityName(),
-            new YaBlocksEditor(this, (YoungAndroidBlocksNode) node));
+        YaBlocksEditor newBlocksEditor = new YaBlocksEditor(this, (YoungAndroidBlocksNode) node);
+        addBlocksEditor(((YoungAndroidBlocksNode) node).getEntityName(), newBlocksEditor);
+        newBlocksEditor.initWorkspace();
         formName = ((YoungAndroidBlocksNode) node).getFormName();
       }
     }
@@ -574,6 +571,7 @@ public void execute() {
           pos = -pos - 1;
         }
         insertFileEditor(newDesigner, pos);
+        openFileEditor(newDesigner);
         if (isLastOpened(entityName)) {
           screen1FormLoaded = true;
           if (readyToShowScreen1()) {
@@ -619,6 +617,12 @@ private void addBlocksEditor(String entityName, final BlocksEditor<?, ?> newBloc
       editorMap.put(entityName, editors);
     }
     addFileEditorByType(newBlocksEditor);
+    int pos = Collections.binarySearch(fileIds, newBlocksEditor.getFileId(),
+        getFileIdComparator());
+    if (pos < 0) {
+      pos = -pos - 1;
+    }
+    insertFileEditor(newBlocksEditor, pos);
   }
 
   private void removeFormEditor(String formName) {

appinventor/appengine/war/index.jsp

@@ -120,16 +120,15 @@
     <script src="static/js/tutorial.js"></script>
     <script type="text/javascript" src="static/closure-compiler/base.js"></script>
     <script type="text/javascript" src="<%= odeBase %>ode/aiblockly-@blocklyeditor_BlocklyChecksum@.js"></script>
-    <script type="text/javascript" src="static/js/scroll-options-6.0.16.min.js"></script>
-    <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/scroll-options-13.2.0.min.js"></script>
+    <script type="text/javascript" src="static/js/workspace-search-13.2.0.min.js"></script>
+    <script type="text/javascript" src="static/js/block-dynamic-connection-13.2.0.min.js"></script>
     <script type="text/javascript" src="static/js/pickr.min.js"></script>
-    <script type="text/javascript" src="static/js/workspace-multiselect-pr135-edf5dd2.min.js"></script>
-    <script type="text/javascript" src="static/js/keyboard-navigation-0.7.0.min.js"></script>
+    <script type="text/javascript" src="static/js/workspace-multiselect-pr154-e4e120e.min.js"></script>
     <script type="text/javascript" src="<%= odeBase %>ode/cdnok.js"></script>
     <script type="text/javascript" src="static/js/jszip.min.js"></script>
     <script type="text/javascript" src="<%= odeBase %>ode/ode.nocache.js"></script>
-    <script type="text/javascript" src="static/js/blockly-field-colour-5.0.19.min.js"></script>
+    <script type="text/javascript" src="static/js/blockly-field-colour-13.2.0.min.js"></script>
     <script type="text/javascript">
       // Register FieldColour plugin for Blockly v11 compatibility
       if (typeof window.registerFieldColour === 'function') {