From cba6fb844abd593fa58d41f12960728e4232e6b8 Mon Sep 17 00:00:00 2001
From: Chris Wanstrath <chris@ozmm.org>
Date: Sun, 6 Nov 2011 15:59:26 -0800
Subject: [PATCH] atomController.path => window.path

---
 extensions/filefinder/filefinder-pane.coffee |  9 ++++-----
 extensions/tree/tree-pane.coffee             |  4 ++--
 extensions/tree/tree.coffee                  |  4 ++--
 src/editor.coffee                            |  4 ++--
 src/window.coffee                            | 13 +++++++------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/extensions/filefinder/filefinder-pane.coffee b/extensions/filefinder/filefinder-pane.coffee
index deee04ba9..e8170c34c 100644
--- a/extensions/filefinder/filefinder-pane.coffee
+++ b/extensions/filefinder/filefinder-pane.coffee
@@ -13,7 +13,6 @@ class FilefinderPane extends Pane
   html: require "filefinder/filefinder.html"
 
   constructor: (@filefinder) ->
-    @path = atomController.path
     $('#filefinder input').live 'keydown', @onKeydown
 
     css   = File.read require.resolve 'filefinder/facebox.css'
@@ -43,9 +42,9 @@ class FilefinderPane extends Pane
       @showFinder()
     @showing = not @showing
 
-  paths: -> 
+  paths: ->
     _paths = []
-    for dir in File.list @path
+    for dir in File.list window.path
       continue if /\.git|Cocoa/.test dir
       _paths.push File.listDirectoryTree dir
     _.reject _.flatten(_paths), (dir) -> File.isDirectory dir
@@ -54,7 +53,7 @@ class FilefinderPane extends Pane
     $.facebox @html
     @files = []
     for file in @paths()
-      @files.push file.replace "#{@path}/", ''
+      @files.push file.replace "#{window.path}/", ''
     @filterFiles()
 
   findMatchingFiles: (query) ->
@@ -87,7 +86,7 @@ class FilefinderPane extends Pane
     $('#filefinder li:first').addClass 'selected'
 
   openSelected: ->
-    dir  = @path
+    dir  = window.path
     file = $('#filefinder .selected').text()
     window.open "#{dir}/#{file}"
     @toggle()
diff --git a/extensions/tree/tree-pane.coffee b/extensions/tree/tree-pane.coffee
index 3176188de..412375035 100644
--- a/extensions/tree/tree-pane.coffee
+++ b/extensions/tree/tree-pane.coffee
@@ -47,8 +47,8 @@ class TreePane extends Pane
       true
 
   reload: ->
-    @html.children('#tree .cwd').text _.last atomController.path.split '/'
-    fileList = @createList atomController.path
+    @html.children('#tree .cwd').text _.last window.path.split '/'
+    fileList = @createList window.path
     fileList.addClass 'files'
     @html.children('#tree .files').replaceWith fileList
 
diff --git a/extensions/tree/tree.coffee b/extensions/tree/tree.coffee
index 3d8748106..9f66040bd 100644
--- a/extensions/tree/tree.coffee
+++ b/extensions/tree/tree.coffee
@@ -16,7 +16,7 @@ class Tree extends Extension
     KeyBinder.load require.resolve "tree/key-bindings.coffee"
 
     # watch the root dir
-    Watcher.watch atomController.path, @watchDir
+    Watcher.watch window.path, @watchDir
 
     # Hide dirs that no longer exist, watch dirs that do.
     for dir in @shownDirs()
@@ -34,7 +34,7 @@ class Tree extends Extension
     @unwatchDir dir for dir in @shownDirs()
 
   shownDirStorageKey: ->
-    @.constructor.name + ":" + atomController.path + ":shownDirs"
+    @.constructor.name + ":" + window.path + ":shownDirs"
 
   watchDir: (dir) =>
     @pane.reload()
diff --git a/src/editor.coffee b/src/editor.coffee
index b1eec1c1c..2546143ce 100644
--- a/src/editor.coffee
+++ b/src/editor.coffee
@@ -16,8 +16,8 @@ class Editor
 
   buffers: {}
 
-  openPathsKey: "editor.openPaths.#{atomController.path}"
-  focusedPathKey: "editor.focusedPath.#{atomController.path}"
+  openPathsKey: "editor.openPaths.#{window.path}"
+  focusedPathKey: "editor.focusedPath.#{window.path}"
 
   constructor: (path) ->
     KeyBinder.register "editor", @
diff --git a/src/window.coffee b/src/window.coffee
index 52b82086d..b8a3fa2b7 100644
--- a/src/window.coffee
+++ b/src/window.coffee
@@ -19,10 +19,11 @@ windowAdditions =
   startup: () ->
     KeyBinder.register "window", window
 
-    @setTitle atomController.path
+    @path = atomController.path
+    @setTitle @path
 
-    @editor = if fs.isFile atomController.path
-      new Editor atomController.path
+    @editor = if fs.isFile @path
+      new Editor @path
     else
       new Editor
 
@@ -33,7 +34,7 @@ windowAdditions =
     @editor.restoreOpenBuffers()
 
   storageKey: ->
-    "window:" + atomController.path
+    "window:" + @path
 
   loadExtensions: ->
     extension.shutdown() for extension in @extensions
@@ -73,7 +74,7 @@ windowAdditions =
 
   reload: ->
     atomController.close
-    OSX.NSApp.createController atomController.path
+    OSX.NSApp.createController @path
 
   # Do open and close even belong here?
   open: (path) ->
@@ -96,7 +97,7 @@ windowAdditions =
     Event.trigger.apply Event, arguments
 
   canOpen: (path) ->
-    parent = atomController.path.replace(/([^\/])$/, "$1/")
+    parent = @path.replace(/([^\/])$/, "$1/")
     child = path.replace(/([^\/])$/, "$1/")
 
     # If the child is contained by the parent, it can be opened by this window