From a6afc319c656245a25a8a0185cb0426f13dd45f5 Mon Sep 17 00:00:00 2001 From: Corey Johnson & Nathan Sobo Date: Fri, 20 Apr 2012 17:52:11 -0600 Subject: [PATCH] Mini-editors ignore the 'close' event --- spec/app/editor-spec.coffee | 10 ++++++++++ src/app/editor.coffee | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/spec/app/editor-spec.coffee b/spec/app/editor-spec.coffee index bfef64e30..7622fc24f 100644 --- a/spec/app/editor-spec.coffee +++ b/spec/app/editor-spec.coffee @@ -2191,4 +2191,14 @@ describe "Editor", -> editor.splitLeft() editor.splitRight() + describe "when 'close' is triggered", -> + it "calls remove on the editor if mini is false", -> + expect(editor.mini).toBeFalsy() + spyOn(editor, 'remove') + editor.trigger 'close' + expect(editor.remove).toHaveBeenCalled() + editor = new Editor(mini: true) + spyOn(editor, 'remove') + editor.trigger 'close' + expect(editor.remove).not.toHaveBeenCalled() diff --git a/src/app/editor.coffee b/src/app/editor.coffee index fc61c8d0c..d37df58e9 100644 --- a/src/app/editor.coffee +++ b/src/app/editor.coffee @@ -53,7 +53,7 @@ class Editor extends View new Editor(viewState) - initialize: ({editSessions, activeEditSessionIndex, buffer, isFocused}) -> + initialize: ({editSessions, activeEditSessionIndex, buffer, isFocused, @mini}) -> requireStylesheet 'editor.css' requireStylesheet 'theme/twilight.css' @@ -119,7 +119,7 @@ class Editor extends View 'split-right': @splitRight 'split-up': @splitUp 'split-down': @splitDown - 'close': @remove + 'close': @close 'show-next-buffer': @loadNextEditSession 'show-previous-buffer': @loadPreviousEditSession @@ -542,6 +542,9 @@ class Editor extends View pane: -> @parent('.pane').view() + close: -> + @remove() unless @mini + remove: (selector, keepData) -> return super if keepData