From 151d22c325a17106466a053b8071af4aa044bb4f Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Tue, 11 Mar 2014 13:22:03 -0700 Subject: [PATCH] Destroy items on pane:close Previously pane:close would do nothing because of the guards in Pane::destroy. Also renames the menu to Close Pane to be more accurate. Closes #1686 --- menus/darwin.cson | 2 +- src/pane-view.coffee | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/menus/darwin.cson b/menus/darwin.cson index f5d512c4c..01c4283d2 100644 --- a/menus/darwin.cson +++ b/menus/darwin.cson @@ -38,7 +38,7 @@ { label: 'Save All', command: 'window:save-all' } { type: 'separator' } { label: 'Close Buffer', command: 'core:close' } - { label: 'Close All Buffers', command: 'pane:close' } + { label: 'Close Pane', command: 'pane:close' } { label: 'Close Window', command: 'window:close' } ] } diff --git a/src/pane-view.coffee b/src/pane-view.coffee index 59fb98074..b5b96b7a4 100644 --- a/src/pane-view.coffee +++ b/src/pane-view.coffee @@ -75,7 +75,9 @@ class PaneView extends View @command 'pane:split-right', => @splitRight(@copyActiveItem()) @command 'pane:split-up', => @splitUp(@copyActiveItem()) @command 'pane:split-down', => @splitDown(@copyActiveItem()) - @command 'pane:close', => @model.destroy() + @command 'pane:close', => + @model.destroyItems() + @model.destroy() @command 'pane:close-other-items', => @destroyInactiveItems() # Deprecated: Use ::destroyItem