From fe01ded75ba8b2e2c8b31f0183a37ca8420c2462 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Tue, 14 Jan 2014 10:49:21 -0700 Subject: [PATCH] Move WorkspaceView::saveActivePaneItem* to Workspace model --- src/workspace-view.coffee | 14 +++----------- src/workspace.coffee | 10 +++++++++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee index 5f925282b..f0c6f2426 100644 --- a/src/workspace-view.coffee +++ b/src/workspace-view.coffee @@ -46,7 +46,7 @@ class WorkspaceView extends View @delegatesProperty 'fullScreen', 'destroyedItemUris', toProperty: 'model' @delegatesMethods 'open', 'openSync', 'openSingletonSync', 'reopenItemSync', - toProperty: 'model' + 'saveActivePaneItem', 'saveActivePaneItemAs', toProperty: 'model' @version: 4 @@ -206,11 +206,11 @@ class WorkspaceView extends View # Public: Returns the currently focused {PaneView}. getActivePane: -> - @panes.getActivePane() + @model.activePane # Public: Returns the currently focused item from within the focused {PaneView} getActivePaneItem: -> - @panes.getActivePaneItem() + @model.activePaneItem # Public: Returns the view of the currently focused item. getActiveView: -> @@ -220,14 +220,6 @@ class WorkspaceView extends View destroyActivePaneItem: -> @getActivePane()?.destroyActiveItem() - # Public: save the active item. - saveActivePaneItem: -> - @getActivePane()?.saveActiveItem() - - # Public: save the active item as. - saveActivePaneItemAs: -> - @getActivePane()?.saveActiveItemAs() - # Public: Focuses the previous pane by id. focusPreviousPane: -> @panes.focusPreviousPane() diff --git a/src/workspace.coffee b/src/workspace.coffee index 93fac7815..48e563293 100644 --- a/src/workspace.coffee +++ b/src/workspace.coffee @@ -11,7 +11,7 @@ class Workspace extends Model atom.deserializers.add(this) Serializable.includeInto(this) - @delegatesProperty 'activePane', toProperty: 'paneContainer' + @delegatesProperty 'activePane', 'activePaneItem', toProperty: 'paneContainer' @delegatesMethod 'getPanes', toProperty: 'paneContainer' @properties @@ -111,6 +111,14 @@ class Workspace extends Model if uri = @destroyedItemUris.pop() @openSync(uri) + # Public: save the active item. + saveActivePaneItem: -> + @activePane?.saveActiveItem() + + # Public: save the active item as. + saveActivePaneItemAs: -> + @activePane?.saveActiveItemAs() + # Private: Removes the item's uri from the list of potential items to reopen. itemOpened: (item) -> if uri = item.getUri?()