window.path doesn't exist if we have atom.path

This commit is contained in:
Corey Johnson
2011-11-10 15:00:45 -08:00
parent 0e0d0905b9
commit 35a78425c9
6 changed files with 12 additions and 12 deletions

View File

@@ -13,7 +13,7 @@ class TinyTest extends Extension
'Command-Ctrl-T': 'runTests'
runTests: ->
_.map File.list(@window.path + '/test'), @runTest
_.map File.list(atom.path + '/test'), @runTest
runTest: (path) ->
# Even though we already have the path, run it

View File

@@ -38,7 +38,7 @@ class FilefinderPane extends Pane
paths: ->
_paths = []
for dir in File.list window.path
for dir in File.list atom.path
continue if /\.git|Cocoa/.test dir
_paths.push File.listDirectoryTree dir
_.reject _.flatten(_paths), (dir) -> File.isDirectory dir
@@ -47,7 +47,7 @@ class FilefinderPane extends Pane
@modal.show()
@files = []
for file in @paths()
@files.push file.replace "#{window.path}/", ''
@files.push file.replace "#{atom.path}/", ''
@filterFiles()
findMatchingFiles: (query) ->
@@ -80,7 +80,7 @@ class FilefinderPane extends Pane
$('#filefinder li:first').addClass 'selected'
openSelected: ->
dir = window.path
dir = atom.path
file = $('#filefinder .selected').text()
window.open "#{dir}/#{file}"
@toggle()

View File

@@ -46,7 +46,7 @@ class TreePane extends Pane
true
reload: ->
@html.children('#tree .cwd').text _.last window.path.split '/'
@html.children('#tree .cwd').text _.last atom.path.split '/'
fileList = @createList @tree.paths
fileList.addClass 'files'
@html.children('#tree .files').replaceWith fileList

View File

@@ -18,7 +18,7 @@ class Tree extends Extension
atom.keybinder.load require.resolve "tree/key-bindings.coffee"
# watch the root dir
Watcher.watch window.path, @watchDir
Watcher.watch atom.path, @watchDir
# Hide dirs that no longer exist, watch dirs that do.
for dir in @shownDirs()
@@ -27,25 +27,25 @@ class Tree extends Extension
else
Watcher.watch dir, @watchDir
@paths = @findPaths window.path
@paths = @findPaths atom.path
@pane = new TreePane @
startup: ->
@pane.show()
shutdown: ->
@unwatchDir window.path
@unwatchDir atom.path
@unwatchDir dir for dir in @shownDirs()
reload: ->
@pane.reload()
shownDirStorageKey: ->
@.constructor.name + ":" + window.path + ":shownDirs"
@.constructor.name + ":" + atom.path + ":shownDirs"
watchDir: (changeType, dir) =>
# Update the paths
@paths = @findPaths window.path
@paths = @findPaths atom.path
@pane.reload()
unwatchDir: (dir) ->

View File

@@ -9,7 +9,7 @@ windowAdditions =
path: null
startup: ->
@path = $atomController.path.toString()
@path = atom.path
@setTitle (_.last @path.split '/') or 'Untitled Document'
$atomController.window.makeKeyWindow

View File

@@ -32,7 +32,7 @@ atom.app = new App
for name, method of atom.app
atom[name] = atom.app[name]
atom.path = $atomController.path.toString()
atom.path = $atomController.path?.valueOf()
if handler = Document.handler atom.path
atom.document = new handler atom.path
else