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

Merge branch 'master' into atom-textarea

Browse Source
This commit is contained in:
joshaber
2016-02-29 16:41:01 -05:00
parent dfd3e1b948 920d348014
commit 707bdf3f39
14 changed files with 362 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/workspace.coffee
View File

@@ -409,6 +409,9 @@ class Workspace extends Model
# containing pane. Defaults to `true`.
# * `activateItem` A {Boolean} indicating whether to call {Pane::activateItem}
# on containing pane. Defaults to `true`.
# * `pending` A {Boolean} indicating whether or not the item should be opened
# in a pending state. Existing pending items in a pane are replaced with
# new pending items when they are opened.
# * `searchAllPanes` A {Boolean}. If `true`, the workspace will attempt to
# activate an existing item for the given URI on any pane.
# If `false`, only the active pane will be searched for
@@ -483,7 +486,7 @@ class Workspace extends Model
if uri?
if item = pane.itemForURI(uri)
item.terminatePendingState?() if item.isPending?() and not options.pending
pane.clearPendingItem() if not options.pending and pane.getPendingItem() is item
item ?= opener(uri, options) for opener in @getOpeners() when not item
try
@@ -506,7 +509,7 @@ class Workspace extends Model
return item if pane.isDestroyed()
@itemOpened(item)
pane.activateItem(item) if activateItem
pane.activateItem(item, options.pending) if activateItem
pane.activate() if activatePane
initialLine = initialColumn = 0