Merge pull request #6411 from lkcampbell/6334-update

redmunds · redmunds · commit cc4da7cef701 · 2014-01-10T16:06:01.000-08:00
Reload Without Extensions update
diff --git a/src/extensions/default/DebugCommands/keyboard.json b/src/extensions/default/DebugCommands/keyboard.json
@@ -16,5 +16,14 @@
             "key": "Cmd-R",
             "platform": "mac"
         }
+    ],
+    "reloadWithoutUserExts":  [
+        {
+            "key": "Shift-F5"
+        },
+        {
+            "key": "Cmd-Shift-R",
+            "platform": "mac"
+        }
     ]
 }
diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js
@@ -181,23 +181,27 @@ define(function (require, exports, module) {
         var href    = window.location.href,
             params  = new UrlParams();
         
-        // Remove all menus to assure extension menus and menu items are removed
-        _.forEach(Menus.getAllMenus(), function (value, key) {
-            Menus.removeMenu(key);
-        });
-        
-        params.parse();
-        
-        if (!params.get("reloadWithoutUserExts")) {
-            params.put("reloadWithoutUserExts", true);
-        }
-        
-        if (href.indexOf("?") !== -1) {
-            href = href.substring(0, href.indexOf("?"));
-        }
-        
-        href += "?" + params.toString();
-        browserReload(href);
+        // Give Mac native menus extra time to update shortcut highlighting prior
+        // to removing menus, or else the highlights get messed up after the reload.
+        window.setTimeout(function () {
+            // Remove all menus to assure extension menus and menu items are removed
+            _.forEach(Menus.getAllMenus(), function (value, key) {
+                Menus.removeMenu(key);
+            });
+            
+            params.parse();
+            
+            if (!params.get("reloadWithoutUserExts")) {
+                params.put("reloadWithoutUserExts", true);
+            }
+            
+            if (href.indexOf("?") !== -1) {
+                href = href.substring(0, href.indexOf("?"));
+            }
+            
+            href += "?" + params.toString();
+            browserReload(href);
+        }, 100);
     }
         
     function handleNewBracketsWindow() {
@@ -364,7 +368,7 @@ define(function (require, exports, module) {
     var menu = Menus.addMenu(Strings.DEBUG_MENU, DEBUG_MENU, Menus.BEFORE, Menus.AppMenuBar.HELP_MENU);
     menu.addMenuItem(DEBUG_SHOW_DEVELOPER_TOOLS, KeyboardPrefs.showDeveloperTools);
     menu.addMenuItem(DEBUG_REFRESH_WINDOW, KeyboardPrefs.refreshWindow);
-    menu.addMenuItem(DEBUG_RELOAD_WITHOUT_USER_EXTS);
+    menu.addMenuItem(DEBUG_RELOAD_WITHOUT_USER_EXTS, KeyboardPrefs.reloadWithoutUserExts);
     menu.addMenuItem(DEBUG_NEW_BRACKETS_WINDOW);
     menu.addMenuDivider();
     menu.addMenuItem(DEBUG_SWITCH_LANGUAGE);
@@ -394,7 +398,7 @@ define(function (require, exports, module) {
             CommandManager.get(Commands.FILE_EXTENSION_MANAGER).setEnabled(false);
             $icon.css({display: "none"});
             StatusBar.addIndicator(USER_EXT_STATUS_ID, $indicator, true);
-            console.log("Brackets reloaded with user extensions disabled");
+            console.log("Brackets reloaded with extensions disabled");
         } else {
             CommandManager.get(Commands.FILE_EXTENSION_MANAGER).setEnabled(true);
             // Toolbar and status bar reload back to default states, no need to set
diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js
@@ -196,7 +196,7 @@ define({
     "STATUSBAR_TAB_SIZE"                    : "Tab Size:",
     "STATUSBAR_LINE_COUNT_SINGULAR"         : "\u2014 {0} Line",
     "STATUSBAR_LINE_COUNT_PLURAL"           : "\u2014 {0} Lines",
-    "STATUSBAR_USER_EXTENSIONS_DISABLED"    : "User Extensions Disabled",
+    "STATUSBAR_USER_EXTENSIONS_DISABLED"    : "Extensions Disabled",
 
     // CodeInspection: errors/warnings
     "ERRORS_PANEL_TITLE_MULTIPLE"           : "{0} Problems",
@@ -440,8 +440,8 @@ define({
     // extensions/default/DebugCommands
     "DEBUG_MENU"                                : "Debug",
     "CMD_SHOW_DEV_TOOLS"                        : "Show Developer Tools",
-    "CMD_REFRESH_WINDOW"                        : "Reload {APP_NAME}",
-    "CMD_RELOAD_WITHOUT_USER_EXTS"              : "Reload Without User Extensions",
+    "CMD_REFRESH_WINDOW"                        : "Reload With Extensions",
+    "CMD_RELOAD_WITHOUT_USER_EXTS"              : "Reload Without Extensions",
     "CMD_NEW_BRACKETS_WINDOW"                   : "New {APP_NAME} Window",
     "CMD_SWITCH_LANGUAGE"                       : "Switch Language",
     "CMD_RUN_UNIT_TESTS"                        : "Run Tests",

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,14 @@`
`16`	`16`	`"key": "Cmd-R",`
`17`	`17`	`"platform": "mac"`
`18`	`18`	`}`
	`19`	`+ ],`
	`20`	`+ "reloadWithoutUserExts": [`
	`21`	`+ {`
	`22`	`+ "key": "Shift-F5"`
	`23`	`+ },`
	`24`	`+ {`
	`25`	`+ "key": "Cmd-Shift-R",`
	`26`	`+ "platform": "mac"`
	`27`	`+ }`
`19`	`28`	`]`
`20`	`29`	`}`