Better Open experience

yongkangchen · Jul 8, 2014 · ddfe1dc · thomasjo · Aug 4, 2014 · yongkangchen
1 parent 0793f29
commit ddfe1dc
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/browser/atom-application.coffee b/src/browser/atom-application.coffee
@@ -284,6 +284,11 @@ class AtomApplication
     for atomWindow in @windows
       return atomWindow if atomWindow.containsPath(pathToOpen)
 
+    for atomWindow in @windows
+      if not atomWindow.getInitialPath(pathToOpen)
+        atomWindow.setInitiaPath(pathToOpen)
+        return atomWindow 
+
   # Public: Returns the currently focused {AtomWindow} or undefined if none.
   focusedWindow: ->
     _.find @windows, (atomWindow) -> atomWindow.isFocused()

diff --git a/src/browser/atom-window.coffee b/src/browser/atom-window.coffee
@@ -40,11 +40,9 @@ class AtomWindow
       @constructor.includeShellLoadTime = false
       loadSettings.shellLoadTime ?= Date.now() - global.shellStartTime
 
-    loadSettings.initialPath = pathToOpen
-    if fs.statSyncNoException(pathToOpen).isFile?()
-      loadSettings.initialPath = path.dirname(pathToOpen)
-
     @browserWindow.loadSettings = loadSettings
+    @setInitiaPath(pathToOpen)
+
     @browserWindow.once 'window:loaded', =>
       @emit 'window:loaded'
       @loaded = true
@@ -69,6 +67,12 @@ class AtomWindow
   getInitialPath: ->
     @browserWindow.loadSettings.initialPath
 
+  setInitiaPath: (pathToOpen) ->
+    loadSettings = @browserWindow.loadSettings
+    loadSettings.initialPath = pathToOpen
+    if fs.statSyncNoException(pathToOpen).isFile?()
+      loadSettings.initialPath = path.dirname(pathToOpen)
+
   containsPath: (pathToCheck) ->
     initialPath = @getInitialPath()
     if not initialPath

diff --git a/src/window-event-handler.coffee b/src/window-event-handler.coffee
@@ -28,8 +28,11 @@ class WindowEventHandler
     @subscribe $(window), 'blur', -> $("body").addClass('is-blurred')
 
     @subscribe $(window), 'window:open-path', (event, {pathToOpen, initialLine, initialColumn}) ->
-      unless fs.isDirectorySync(pathToOpen)
+      if not fs.isDirectorySync(pathToOpen)
         atom.workspace?.open(pathToOpen, {initialLine, initialColumn})
+      else
+        atom.project?.setPath(pathToOpen)
+        atom.workspaceView?.trigger "tree-view:show"
 
     @subscribe $(window), 'beforeunload', =>
       confirmed = atom.workspaceView?.confirmClose()