Merge pull request #5951 from sathyamoorthi/closeOthers-improvement-PR2

ingorichter · ingorichter · commit 7bda08099d51 · 2013-11-13T09:14:59.000-08:00
Fix for #5800
diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js
@@ -1064,7 +1064,7 @@ define(function (require, exports, module) {
         result.done(function (listAfterSave) {
             listAfterSave = listAfterSave || list;
             if (!promptOnly) {
-                DocumentManager.removeListFromWorkingSet(listAfterSave, (clearCurrentDoc || true));
+                DocumentManager.removeListFromWorkingSet(listAfterSave, clearCurrentDoc);
             }
         });
         
@@ -1081,15 +1081,15 @@ define(function (require, exports, module) {
      */
     function handleFileCloseAll(commandData) {
         return _doCloseDocumentList(DocumentManager.getWorkingSet(),
-                                    (commandData && commandData.promptOnly)).done(function () {
+                                    (commandData && commandData.promptOnly), true).done(function () {
             if (!DocumentManager.getCurrentDocument()) {
                 EditorManager.closeCustomViewer();
             }
         });
     }
     
     function handleFileCloseList(commandData) {
-        return _doCloseDocumentList((commandData && commandData.documentList), false).done(function () {
+        return _doCloseDocumentList((commandData && commandData.documentList), false, false).done(function () {
             if (!DocumentManager.getCurrentDocument()) {
                 EditorManager.closeCustomViewer();
             }

Original file line number	Diff line number	Diff line change
`@@ -1064,7 +1064,7 @@ define(function (require, exports, module) {`
`1064`	`1064`	`result.done(function (listAfterSave) {`
`1065`	`1065`	`listAfterSave = listAfterSave \|\| list;`
`1066`	`1066`	`if (!promptOnly) {`
`1067`		`- DocumentManager.removeListFromWorkingSet(listAfterSave, (clearCurrentDoc \|\| true));`
	`1067`	`+ DocumentManager.removeListFromWorkingSet(listAfterSave, clearCurrentDoc);`
`1068`	`1068`	`}`
`1069`	`1069`	`});`
`1070`	`1070`
`@@ -1081,15 +1081,15 @@ define(function (require, exports, module) {`
`1081`	`1081`	`*/`
`1082`	`1082`	`function handleFileCloseAll(commandData) {`
`1083`	`1083`	`return _doCloseDocumentList(DocumentManager.getWorkingSet(),`
`1084`		`- (commandData && commandData.promptOnly)).done(function () {`
	`1084`	`+ (commandData && commandData.promptOnly), true).done(function () {`
`1085`	`1085`	`if (!DocumentManager.getCurrentDocument()) {`
`1086`	`1086`	`EditorManager.closeCustomViewer();`
`1087`	`1087`	`}`
`1088`	`1088`	`});`
`1089`	`1089`	`}`
`1090`	`1090`
`1091`	`1091`	`function handleFileCloseList(commandData) {`
`1092`		`- return _doCloseDocumentList((commandData && commandData.documentList), false).done(function () {`
	`1092`	`+ return _doCloseDocumentList((commandData && commandData.documentList), false, false).done(function () {`
`1093`	`1093`	`if (!DocumentManager.getCurrentDocument()) {`
`1094`	`1094`	`EditorManager.closeCustomViewer();`
`1095`	`1095`	`}`