merge upstream

1 files changed, 25 insertions, 9 deletions

diff --git a/gui.js b/gui.js
index dab70d1..8040390 100644
--- a/gui.js
+++ b/gui.js
@@ -69,7 +69,7 @@ SpeechBubbleMorph*/
 
 // Global stuff ////////////////////////////////////////////////////////
 
-modules.gui = '2015-March-21';
+modules.gui = '2015-May-01';
 
 // Declarations
 
@@ -439,8 +439,21 @@ IDE_Morph.prototype.openIn = function (world) {
                             myself.shield.destroy();
                             myself.shield = null;
                             msg.destroy();
-                            myself.toggleAppMode(true);
-                            myself.runScripts();
+
+                            if (dict.editMode) {
+                                myself.toggleAppMode(false);
+                            } else {
+                                myself.toggleAppMode(true);
+                            }
+
+                            if (!dict.noRun) {
+                                myself.runScripts();
+                            }
+
+                            if (dict.hideControls) {
+                                myself.controlBar.hide();
+                                window.onbeforeunload = function () {nop(); };
+                            }
                         }
                     ]);
                 },
@@ -2527,12 +2540,15 @@ IDE_Morph.prototype.projectMenu = function () {
     if (GitHub.username) {
         menu.addItem('Save with commit message', 'commitProjectToGitHub');
     }
-    menu.addItem(
-        'Save to disk',
-        'saveProjectToDisk',
-        'store this project\nin the downloads folder\n'
-            + '(in supporting browsers)'
-    );
+    if (shiftClicked) {
+        menu.addItem(
+            'Save to disk',
+            'saveProjectToDisk',
+            'store this project\nin the downloads folder\n'
+                + '(in supporting browsers)',
+            new Color(100, 0, 0)
+        );
+    }
     menu.addItem('Save As...', 'saveProjectsBrowser');
     menu.addLine();
     menu.addItem(