From d7767553483732e77142c85d584b350123cd39c4 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Thu, 12 Apr 2012 15:56:41 -0600
Subject: [PATCH] Focus the active editor when the file finder is closed

---
 spec/app/root-view-spec.coffee | 2 +-
 src/app/file-finder.coffee     | 4 ++++
 src/app/root-view.coffee       | 1 -
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/spec/app/root-view-spec.coffee b/spec/app/root-view-spec.coffee
index 69571f223..1a57e1156 100644
--- a/spec/app/root-view-spec.coffee
+++ b/spec/app/root-view-spec.coffee
@@ -394,11 +394,11 @@ describe "RootView", ->
         expect(editor1.buffer.path).not.toBe expectedPath
         expect(editor2.buffer.path).not.toBe expectedPath
 
-        # debugger
         rootView.fileFinder.trigger 'file-finder:select-file'
 
         expect(editor1.buffer.path).not.toBe expectedPath
         expect(editor2.buffer.path).toBe expectedPath
+        expect(editor2.isFocused).toBeTruthy()
 
   describe "keymap wiring", ->
     commandHandler = null
diff --git a/src/app/file-finder.coffee b/src/app/file-finder.coffee
index c7f006bd7..be77e1764 100644
--- a/src/app/file-finder.coffee
+++ b/src/app/file-finder.coffee
@@ -71,3 +71,7 @@ class FileFinder extends View
       paths = (pathAndScore.path for pathAndScore in scoredPaths when pathAndScore.score > 0)
 
     paths.slice 0, @maxResults
+
+  remove: ->
+    $('#panes .editor.active').focus()
+    super
diff --git a/src/app/root-view.coffee b/src/app/root-view.coffee
index 4ce4ea210..6caed5938 100644
--- a/src/app/root-view.coffee
+++ b/src/app/root-view.coffee
@@ -185,7 +185,6 @@ class RootView extends View
     if @fileFinder and @fileFinder.parent()[0]
       @fileFinder.remove()
       @fileFinder = null
-      @activeEditor().focus()
     else
       @project.getFilePaths().done (paths) =>
         relativePaths = (path.replace(@project.path, "") for path in paths)