github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-15 09:05:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Deprecate Project::resolve"

Browse Source 
This reverts commit 3c5bd9f10a.
This commit is contained in:
Nathan Sobo
2015-01-09 13:58:01 -08:00
parent 3c5bd9f10a
commit 19bf64f3cd
8 changed files with 85 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/workspace.coffee
View File

@@ -383,7 +383,7 @@ class Workspace extends Model
open: (uri, options={}) ->
searchAllPanes = options.searchAllPanes
split = options.split
uri = atom.project.getDirectories()[0]?.resolve(uri)
uri = atom.project.resolve(uri)
pane = @paneContainer.paneForUri(uri) if searchAllPanes
pane ?= switch split
@@ -422,7 +422,7 @@ class Workspace extends Model
{initialLine, initialColumn} = options
activatePane = options.activatePane ? true
uri = atom.project.getDirectories()[0]?.resolve(uri)
uri = atom.project.resolve(uri)
item = @getActivePane().itemForUri(uri)
if uri
@@ -445,7 +445,7 @@ class Workspace extends Model
if uri?
item = pane.itemForUri(uri)
item ?= opener(atom.project.getDirectories()[0]?.resolve(uri), options) for opener in @getOpeners() when !item
item ?= opener(atom.project.resolve(uri), options) for opener in @getOpeners() when !item
item ?= atom.project.open(uri, options)
Q(item)