Merge pull request #2888 from TomMalbran/tom/fix-issue-2877

jasonsanjose · jasonsanjose · commit 4c42b81c3f8e · 2013-02-21T13:43:22.000-08:00
Fix Issue #2877: Debug menu shortcuts are enabled even when Debug menu is hidden
diff --git a/src/debug/DebugCommandHandlers.js b/src/debug/DebugCommandHandlers.js
@@ -263,7 +263,7 @@ define(function (require, exports, module) {
     
     // Show Developer Tools (optionally enabled)
     CommandManager.register(Strings.CMD_SHOW_DEV_TOOLS,      Commands.DEBUG_SHOW_DEVELOPER_TOOLS,   handleShowDeveloperTools)
-        .setEnabled(!!brackets.app.showDeveloperTools);
+        .setEnabled(!!brackets.app.showDeveloperTools && brackets.config.show_debug_menu);
     CommandManager.register(Strings.CMD_NEW_BRACKETS_WINDOW, Commands.DEBUG_NEW_BRACKETS_WINDOW,    _handleNewBracketsWindow);
     
     // Start with the "Run Tests" item disabled. It will be enabled later if the test file can be found.
diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js
@@ -900,7 +900,8 @@ define(function (require, exports, module) {
         CommandManager.register(Strings.CMD_QUIT,           Commands.FILE_QUIT, handleFileQuit);
     }
 
-    CommandManager.register(Strings.CMD_REFRESH_WINDOW,     Commands.DEBUG_REFRESH_WINDOW, handleFileReload);
+    CommandManager.register(Strings.CMD_REFRESH_WINDOW,     Commands.DEBUG_REFRESH_WINDOW, handleFileReload)
+        .setEnabled(brackets.config.show_debug_menu);
     CommandManager.register(Strings.CMD_ABORT_QUIT,         Commands.APP_ABORT_QUIT, _handleAbortQuit);
     
     CommandManager.register(Strings.CMD_NEXT_DOC,           Commands.NAVIGATE_NEXT_DOC, handleGoNextDoc);

Original file line number	Diff line number	Diff line change
`@@ -900,7 +900,8 @@ define(function (require, exports, module) {`
`900`	`900`	`CommandManager.register(Strings.CMD_QUIT, Commands.FILE_QUIT, handleFileQuit);`
`901`	`901`	`}`
`902`	`902`
`903`		`- CommandManager.register(Strings.CMD_REFRESH_WINDOW, Commands.DEBUG_REFRESH_WINDOW, handleFileReload);`
	`903`	`+ CommandManager.register(Strings.CMD_REFRESH_WINDOW, Commands.DEBUG_REFRESH_WINDOW, handleFileReload)`
	`904`	`+ .setEnabled(brackets.config.show_debug_menu);`
`904`	`905`	`CommandManager.register(Strings.CMD_ABORT_QUIT, Commands.APP_ABORT_QUIT, _handleAbortQuit);`
`905`	`906`
`906`	`907`	`CommandManager.register(Strings.CMD_NEXT_DOC, Commands.NAVIGATE_NEXT_DOC, handleGoNextDoc);`