From d4e81ba5a5e6592635ed9fa4e5124747648af65e Mon Sep 17 00:00:00 2001
From: Ty Voliter <tvoliter@cs.stanford.edu>
Date: Mon, 16 Jul 2012 12:44:52 -0700
Subject: [PATCH] Alternative fix for issue #1028. Add new file in working set,
 but keep it selected in the project tree since that is where the user created
 and named the file.

---
 src/document/DocumentCommandHandlers.js | 4 +++-
 src/project/FileViewController.js       | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/document/DocumentCommandHandlers.js b/src/document/DocumentCommandHandlers.js
index 20a63b88794..b55986a2186 100644
--- a/src/document/DocumentCommandHandlers.js
+++ b/src/document/DocumentCommandHandlers.js
@@ -324,7 +324,9 @@ define(function (require, exports, module) {
             ProjectManager.createNewItem(baseDir, suggestedName, false)
                 .pipe(deferred.resolve, deferred.reject, deferred.notify)
                 .always(function () { fileNewInProgress = false; })
-                .done(function (entry) { FileViewController.addToWorkingSetAndSelect(entry.fullPath); });
+                .done(function (entry) {
+                    FileViewController.addToWorkingSetAndSelect(entry.fullPath, FileViewController.PROJECT_MANAGER);
+                });
         };
 
         deferred.done(createWithSuggestedName);
diff --git a/src/project/FileViewController.js b/src/project/FileViewController.js
index 60d93655b95..6aaa8aa487c 100644
--- a/src/project/FileViewController.js
+++ b/src/project/FileViewController.js
@@ -153,9 +153,11 @@ define(function (require, exports, module) {
      * Opens the specified document if it's not already open, adds it to the working set,
      * and selects it in the WorkingSetView
      * @param {!fullPath}
+     * @param {?String} selectIn - specify either WORING_SET_VIEW or PROJECT_MANAGER.
+     *      Default is WORING_SET_VIEW.
      * @return {!$.Promise}
      */
-    function addToWorkingSetAndSelect(fullPath) {
+    function addToWorkingSetAndSelect(fullPath, selectIn) {
         var result = new $.Deferred(),
             promise = CommandManager.execute(Commands.FILE_ADD_TO_WORKING_SET, {fullPath: fullPath});
 
@@ -165,7 +167,7 @@ define(function (require, exports, module) {
         promise.done(function (doc) {
             // FILE_ADD_TO_WORKING_SET command sets the current document. Update the 
             // selection focus and trigger documentSelectionFocusChange event
-            _fileSelectionFocus = WORKING_SET_VIEW;
+            _fileSelectionFocus = selectIn ? selectIn : WORKING_SET_VIEW;
             _selectCurrentDocument();
             
             result.resolve(doc);