From 9849e4e78d475de98f21c96add79da86c96990a8 Mon Sep 17 00:00:00 2001 From: Lance Campbell Date: Wed, 8 Jan 2014 07:30:22 -0800 Subject: [PATCH 1/3] Update menu strings and shortcut keys --- src/extensions/default/DebugCommands/keyboard.json | 9 +++++++++ src/extensions/default/DebugCommands/main.js | 2 +- src/nls/root/strings.js | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/extensions/default/DebugCommands/keyboard.json b/src/extensions/default/DebugCommands/keyboard.json index 7937f5703ee..9d96203e78b 100644 --- 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" + } ] } \ No newline at end of file diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js index df69905ad03..80c2126559d 100644 --- a/src/extensions/default/DebugCommands/main.js +++ b/src/extensions/default/DebugCommands/main.js @@ -364,7 +364,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); diff --git a/src/nls/root/strings.js b/src/nls/root/strings.js index 797f97f55e8..e72815317b8 100644 --- a/src/nls/root/strings.js +++ b/src/nls/root/strings.js @@ -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", From 7135853387844a1c46627d783f7bc0063f2e4970 Mon Sep 17 00:00:00 2001 From: Lance Campbell Date: Wed, 8 Jan 2014 11:15:49 -0800 Subject: [PATCH 2/3] Change status bar and console log strings --- src/extensions/default/DebugCommands/main.js | 2 +- src/nls/root/strings.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js index 80c2126559d..0137b50acb8 100644 --- a/src/extensions/default/DebugCommands/main.js +++ b/src/extensions/default/DebugCommands/main.js @@ -394,7 +394,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 index e72815317b8..b81a5cac733 100644 --- 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" : "{0} Errors", From c985ce1213b41c42574000171f86b809b683667e Mon Sep 17 00:00:00 2001 From: Lance Campbell Date: Fri, 10 Jan 2014 10:08:43 -0800 Subject: [PATCH 3/3] Fix Mac menu shortcut highlight problem --- src/extensions/default/DebugCommands/main.js | 38 +++++++++++--------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/src/extensions/default/DebugCommands/main.js b/src/extensions/default/DebugCommands/main.js index 0137b50acb8..8e1e1d2d410 100644 --- 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() {