From 63eb032472fa6e95a9c657860da33e7451533916 Mon Sep 17 00:00:00 2001 From: probablycorey Date: Tue, 18 Feb 2014 14:39:02 -0800 Subject: [PATCH 1/3] Give precedence to `searchAllPanes` option in Workspace::open --- src/workspace.coffee | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/workspace.coffee b/src/workspace.coffee index 8b8138b67..41bbc6b6d 100644 --- a/src/workspace.coffee +++ b/src/workspace.coffee @@ -77,16 +77,14 @@ class Workspace extends Model split = options.split uri = atom.project.relativize(uri) ? '' - pane = switch split + pane = @paneContainer.paneForUri(uri) if searchAllPanes + pane ?= switch split when 'left' @activePane.findLeftmostSibling() when 'right' @activePane.findOrCreateRightmostSibling() else - if searchAllPanes - @paneContainer.paneForUri(uri) ? @activePane - else - @activePane + @activePane @openUriInPane(uri, pane, options) From b8d8ae68a39de7471e9b30ae01639f3f50731c2e Mon Sep 17 00:00:00 2001 From: probablycorey Date: Tue, 18 Feb 2014 14:39:39 -0800 Subject: [PATCH 2/3] Add Workspace::getActivePane --- src/workspace.coffee | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/workspace.coffee b/src/workspace.coffee index 41bbc6b6d..b6916a286 100644 --- a/src/workspace.coffee +++ b/src/workspace.coffee @@ -153,6 +153,10 @@ class Workspace extends Model getOpeners: -> atom.project.openers + # Public: Returns the active {Pane}. + getActivePane: -> + @paneContainer.activePane + # Public: save the active item. saveActivePaneItem: -> @activePane?.saveActiveItem() From 6f8cb24e5a763d04bf2cbd6cfb0e04c1bfc63691 Mon Sep 17 00:00:00 2001 From: probablycorey Date: Tue, 18 Feb 2014 14:39:53 -0800 Subject: [PATCH 3/3] Add Workspace::paneForUri --- src/workspace.coffee | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/workspace.coffee b/src/workspace.coffee index b6916a286..c39e32cf4 100644 --- a/src/workspace.coffee +++ b/src/workspace.coffee @@ -157,6 +157,11 @@ class Workspace extends Model getActivePane: -> @paneContainer.activePane + # Public: Returns the first pane {Pane} with an item for the given uri or + # undefined if none exists. + paneForUri: (uri) -> + @paneContainer.paneForUri(uri) + # Public: save the active item. saveActivePaneItem: -> @activePane?.saveActiveItem()