github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-16 17:45:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove relative URI usage

Browse Source
This commit is contained in:
Kevin Sawicki
2014-02-18 18:57:45 -08:00
parent c16435a604
commit 7a04a414f7
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/workspace.coffee
View File

@@ -72,10 +72,10 @@ class Workspace extends Model
# if the uri is already open (default: false)
#
# Returns a promise that resolves to the {Editor} for the file URI.
open: (uri, options={}) ->
open: (uri='', options={}) ->
searchAllPanes = options.searchAllPanes
split = options.split
uri = atom.project.relativize(uri) ? ''
uri = atom.project.resolve(uri)
pane = switch split
when 'left'
@@ -91,15 +91,15 @@ class Workspace extends Model
@openUriInPane(uri, pane, options)
# Only used in specs
openSync: (uri, options={}) ->
openSync: (uri='', options={}) ->
{initialLine} = options
# TODO: Remove deprecated changeFocus option
activatePane = options.activatePane ? options.changeFocus ? true
uri = atom.project.relativize(uri) ? ''
uri = atom.project.resolve(uri)
item = @activePane.itemForUri(uri)
if uri
item ?= opener(atom.project.resolve(uri), options) for opener in @getOpeners() when !item
item ?= opener(uri, options) for opener in @getOpeners() when !item
item ?= atom.project.openSync(uri, {initialLine})
@activePane.activateItem(item)