mirror of
https://github.com/atom/atom.git
synced 2026-01-24 06:18:03 -05:00
Mini-editors ignore the 'close' event
This commit is contained in:
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user