From 2f147435ef1ef50c6ef69aa9df0247c66426a3af Mon Sep 17 00:00:00 2001
From: Lance Campbell <lkcampbell@gmail.com>
Date: Sat, 24 Aug 2013 21:36:32 -0700
Subject: [PATCH 1/4] Add listeners for mouse click, side bar resize, and menu
 popup

---
 src/project/ProjectManager.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js
index 0079dead316..46020dc8272 100644
--- a/src/project/ProjectManager.js
+++ b/src/project/ProjectManager.js
@@ -1546,10 +1546,13 @@ define(function (require, exports, module) {
     // Initialize variables and listeners that depend on the HTML DOM
     AppInit.htmlReady(function () {
         $projectTreeContainer = $("#project-files-container");
-
+        
         $("#open-files-container").on("contentChanged", function () {
             _redraw(false); // redraw jstree when working set size changes
         });
+        
+        $(".main-view").click(forceFinishRename);
+        $("#sidebar").on("panelResizeStart", forceFinishRename);
     });
 
     // Init PreferenceStorage
@@ -1568,7 +1571,8 @@ define(function (require, exports, module) {
     CommandManager.register(Strings.CMD_OPEN_FOLDER,      Commands.FILE_OPEN_FOLDER,      openProject);
     CommandManager.register(Strings.CMD_PROJECT_SETTINGS, Commands.FILE_PROJECT_SETTINGS, _projectSettings);
     CommandManager.register(Strings.CMD_FILE_REFRESH,     Commands.FILE_REFRESH, refreshFileTree);
-
+    CommandManager.register(Strings.CMD_BEFORE_MENUPOPUP, Commands.APP_BEFORE_MENUPOPUP, forceFinishRename);
+    
     // Define public API
     exports.getProjectRoot           = getProjectRoot;
     exports.getBaseUrl               = getBaseUrl;

From 580de96e8373aaed60f54875e335d9121b618a79 Mon Sep 17 00:00:00 2001
From: Lance Campbell <lkcampbell@gmail.com>
Date: Sat, 24 Aug 2013 22:40:24 -0700
Subject: [PATCH 2/4] Do not force rename when clicking on the file that is
 being renamed

---
 src/project/ProjectManager.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js
index 46020dc8272..f9fa99e5fa9 100644
--- a/src/project/ProjectManager.js
+++ b/src/project/ProjectManager.js
@@ -1144,6 +1144,16 @@ define(function (require, exports, module) {
         }
         return true;
     }
+ 
+    /**
+     * Handle a mouse click in the main view
+    * @param {jQueryObject} jqEvent jQuery event object
+     */
+    function _handleMainViewClick(jqEvent) {
+        if (jqEvent.target.className !== "jstree-rename-input") {
+            forceFinishRename();
+        }
+    }
     
     /**
      * Create a new item in the project tree.
@@ -1551,7 +1561,7 @@ define(function (require, exports, module) {
             _redraw(false); // redraw jstree when working set size changes
         });
         
-        $(".main-view").click(forceFinishRename);
+        $(".main-view").click(_handleMainViewClick);
         $("#sidebar").on("panelResizeStart", forceFinishRename);
     });
 

From 92a124c475e7ef397d8a07491ca4e8289d769cfd Mon Sep 17 00:00:00 2001
From: Lance Campbell <lkcampbell@gmail.com>
Date: Sun, 25 Aug 2013 08:03:26 -0700
Subject: [PATCH 3/4] Click handler code cleanup

---
 src/project/ProjectManager.js | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js
index f9fa99e5fa9..201ff410a2d 100644
--- a/src/project/ProjectManager.js
+++ b/src/project/ProjectManager.js
@@ -1144,16 +1144,6 @@ define(function (require, exports, module) {
         }
         return true;
     }
- 
-    /**
-     * Handle a mouse click in the main view
-    * @param {jQueryObject} jqEvent jQuery event object
-     */
-    function _handleMainViewClick(jqEvent) {
-        if (jqEvent.target.className !== "jstree-rename-input") {
-            forceFinishRename();
-        }
-    }
     
     /**
      * Create a new item in the project tree.
@@ -1561,7 +1551,12 @@ define(function (require, exports, module) {
             _redraw(false); // redraw jstree when working set size changes
         });
         
-        $(".main-view").click(_handleMainViewClick);
+        $(".main-view").click(function (jqEvent) {
+            if (jqEvent.target.className !== "jstree-rename-input") {
+                forceFinishRename();
+            }
+        });
+        
         $("#sidebar").on("panelResizeStart", forceFinishRename);
     });
 

From 87754524f4a591462ba724a9350edc75211d60a5 Mon Sep 17 00:00:00 2001
From: Lance Campbell <lkcampbell@gmail.com>
Date: Mon, 26 Aug 2013 06:37:35 -0700
Subject: [PATCH 4/4] Only keeping the mouse click listener

---
 src/project/ProjectManager.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/project/ProjectManager.js b/src/project/ProjectManager.js
index 201ff410a2d..4285b13f62d 100644
--- a/src/project/ProjectManager.js
+++ b/src/project/ProjectManager.js
@@ -1556,8 +1556,6 @@ define(function (require, exports, module) {
                 forceFinishRename();
             }
         });
-        
-        $("#sidebar").on("panelResizeStart", forceFinishRename);
     });
 
     // Init PreferenceStorage
@@ -1576,7 +1574,6 @@ define(function (require, exports, module) {
     CommandManager.register(Strings.CMD_OPEN_FOLDER,      Commands.FILE_OPEN_FOLDER,      openProject);
     CommandManager.register(Strings.CMD_PROJECT_SETTINGS, Commands.FILE_PROJECT_SETTINGS, _projectSettings);
     CommandManager.register(Strings.CMD_FILE_REFRESH,     Commands.FILE_REFRESH, refreshFileTree);
-    CommandManager.register(Strings.CMD_BEFORE_MENUPOPUP, Commands.APP_BEFORE_MENUPOPUP, forceFinishRename);
     
     // Define public API
     exports.getProjectRoot           = getProjectRoot;