From edf2fbe0e5c7e89606aa5d819c63b6ce95167ba4 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Wed, 15 Jan 2014 04:34:35 -0700 Subject: [PATCH] Make 'core:close' destroy the pane itself if it is empty --- src/workspace-view.coffee | 4 ++-- src/workspace.coffee | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee index 6c6c3ce95..2283ce6f0 100644 --- a/src/workspace-view.coffee +++ b/src/workspace-view.coffee @@ -44,7 +44,7 @@ class WorkspaceView extends View @delegatesProperty 'fullScreen', 'destroyedItemUris', toProperty: 'model' @delegatesMethods 'open', 'openSync', 'openSingletonSync', 'reopenItemSync', 'saveActivePaneItem', 'saveActivePaneItemAs', 'saveAll', 'destroyActivePaneItem', - toProperty: 'model' + 'destroyActivePane', toProperty: 'model' @version: 4 @@ -119,7 +119,7 @@ class WorkspaceView extends View @command 'pane:reopen-closed-item', => @reopenItemSync() - @command 'core:close', => @destroyActivePaneItem() + @command 'core:close', => if @getActivePaneItem()? then @destroyActivePaneItem() else @destroyActivePane() @command 'core:save', => @saveActivePaneItem() @command 'core:save-as', => @saveActivePaneItemAs() diff --git a/src/workspace.coffee b/src/workspace.coffee index 39f730e0a..2a4097216 100644 --- a/src/workspace.coffee +++ b/src/workspace.coffee @@ -132,6 +132,10 @@ class Workspace extends Model destroyActivePaneItem: -> @activePane?.destroyActiveItem() + # Public: destroy/close the active pane. + destroyActivePane: -> + @activePane?.destroy() + # Private: Removes the item's uri from the list of potential items to reopen. itemOpened: (item) -> if uri = item.getUri?()