Merge pull request #2037 from adobe/jasonsanjose/closeall

add close all menu item and keyboard shortcut Cmd+Shift+W
adobe · Nov 2, 2012 · 8206b35 · 8206b35
2 parents a3178e9 + c6fc48d
commit 8206b35
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/command/Menus.js b/src/command/Menus.js
@@ -853,6 +853,7 @@ define(function (require, exports, module) {
         menu.addMenuItem(Commands.FILE_OPEN,                "Ctrl-O");
         menu.addMenuItem(Commands.FILE_OPEN_FOLDER);
         menu.addMenuItem(Commands.FILE_CLOSE,               "Ctrl-W");
+        menu.addMenuItem(Commands.FILE_CLOSE_ALL,           "Ctrl-Shift-W");
         menu.addMenuDivider();
         menu.addMenuItem(Commands.FILE_SAVE,                "Ctrl-S");
         menu.addMenuItem(Commands.FILE_SAVE_ALL,            "Ctrl-Alt-S");

diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js
@@ -611,7 +611,8 @@ define(function (require, exports, module) {
      * @return {$.Promise} a promise that is resolved when all files are closed
      */
     function handleFileCloseAll(commandData) {
-        var result = new $.Deferred();
+        var result = new $.Deferred(),
+            promptOnly = commandData && commandData.promptOnly;
 
         var unsavedDocs = [];
         DocumentManager.getWorkingSet().forEach(function (file) {
@@ -627,7 +628,7 @@ define(function (require, exports, module) {
 
         } else if (unsavedDocs.length === 1) {
             // Only one unsaved file: show the usual single-file-close confirmation UI
-            var fileCloseArgs = { file: unsavedDocs[0].file, promptOnly: commandData.promptOnly };
+            var fileCloseArgs = { file: unsavedDocs[0].file, promptOnly: promptOnly };
 
             handleFileClose(fileCloseArgs).done(function () {
                 // still need to close any other, non-unsaved documents
@@ -673,7 +674,7 @@ define(function (require, exports, module) {
         // NOTE: this still happens before any done() handlers added by our caller, because jQ
         // guarantees that handlers run in the order they are added.
         result.done(function () {
-            if (!commandData || !commandData.promptOnly) {
+            if (!promptOnly) {
                 DocumentManager.closeAll();
             }
         });