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

Always check existing active for uri first

Browse Source
This commit is contained in:
probablycorey
2014-02-13 13:57:59 -08:00
parent b3550c6526
commit 9e0436d10e
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/workspace.coffee
View File

@@ -97,11 +97,10 @@ class Workspace extends Model
activatePane = options.activatePane ? options.changeFocus ? true
uri = atom.project.relativize(uri) ? ''
if uri?
item = opener(atom.project.resolve(uri), options) for opener in @getOpeners() when !item
editor = item ? @activePane.itemForUri(uri) ? atom.project.openSync(uri, {initialLine})
else
editor = atom.project.openSync()
editor = @activePane.itemForUri(uri)
if uri
editor ?= opener(atom.project.resolve(uri), options) for opener in @getOpeners() when !editor
editor ?= atom.project.openSync(uri, {initialLine})
@activePane.activateItem(editor)
@itemOpened(editor)
@@ -110,10 +109,13 @@ class Workspace extends Model
openUriInPane: (uri, pane, options={}) ->
changeFocus = options.changeFocus ? true
item = opener(atom.project.resolve(uri), options) for opener in @getOpeners() when !item
promise = Q(item ? pane.itemForUri(uri) ? atom.project.open(uri, options))
promise
editor = pane.itemForUri(uri)
if uri
editor ?= opener(atom.project.resolve(uri), options) for opener in @getOpeners() when !editor
editor ?= atom.project.open(uri, options)
Q(editor)
.then (editor) =>
if not pane
pane = new Pane(items: [editor])