diff --git a/src/app/grammar-view.coffee b/src/app/grammar-view.coffee index 2108392b6..bd0b73251 100644 --- a/src/app/grammar-view.coffee +++ b/src/app/grammar-view.coffee @@ -35,9 +35,6 @@ class GrammarView extends SelectList grammars.unshift(@autoDetect) @setArray(grammars) - cancelled: -> - @miniEditor.setText('') - confirmed: (grammar) -> @cancel() if grammar is @autoDetect diff --git a/src/app/select-list.coffee b/src/app/select-list.coffee index 868171b7a..020aaf734 100644 --- a/src/app/select-list.coffee +++ b/src/app/select-list.coffee @@ -130,6 +130,9 @@ class SelectList extends View restoreFocus: -> @previouslyFocusedElement?.focus() + cancelled: -> + @miniEditor.setText('') + cancel: -> @list.empty() @cancelling = true diff --git a/src/packages/autocomplete/src/autocomplete-view.coffee b/src/packages/autocomplete/src/autocomplete-view.coffee index 7f94875d4..1e071ccf3 100644 --- a/src/packages/autocomplete/src/autocomplete-view.coffee +++ b/src/packages/autocomplete/src/autocomplete-view.coffee @@ -74,10 +74,10 @@ class AutocompleteView extends SelectList @editor.setCursorBufferPosition([position.row, position.column + match.suffix.length]) cancelled: -> + super + @editor.abort() @editor.setSelectedBufferRange(@originalSelectionBufferRange) - - @miniEditor.setText('') @editor.rootView()?.focus() if @miniEditor.isFocused attach: -> diff --git a/src/packages/command-palette/src/command-palette-view.coffee b/src/packages/command-palette/src/command-palette-view.coffee index 874e7bbcd..d723afa54 100644 --- a/src/packages/command-palette/src/command-palette-view.coffee +++ b/src/packages/command-palette/src/command-palette-view.coffee @@ -35,7 +35,6 @@ class CommandPaletteView extends SelectList @setArray(events) @appendTo(@rootView) - @miniEditor.setText('') @miniEditor.focus() itemForElement: ({eventName, eventDescription}) -> @@ -52,5 +51,3 @@ class CommandPaletteView extends SelectList confirmed: ({eventName}) -> @cancel() @previouslyFocusedElement.trigger(eventName) - - cancelled: -> diff --git a/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee b/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee index 6b72ce3ef..2365fc4d7 100644 --- a/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee +++ b/src/packages/fuzzy-finder/src/fuzzy-finder-view.coffee @@ -72,9 +72,6 @@ class FuzzyFinderView extends SelectList @setError('Selected path does not exist') setTimeout((=> @setError()), 2000) - cancelled: -> - @miniEditor.setText('') - toggleFileFinder: -> if @hasParent() @cancel() diff --git a/src/packages/symbols-view/src/symbols-view.coffee b/src/packages/symbols-view/src/symbols-view.coffee index f106ffe77..afcd5109e 100644 --- a/src/packages/symbols-view/src/symbols-view.coffee +++ b/src/packages/symbols-view/src/symbols-view.coffee @@ -88,9 +88,6 @@ class SymbolsView extends SelectList editor.setCursorBufferPosition(position) editor.moveCursorToFirstCharacterOfLine() - cancelled: -> - @miniEditor.setText('') - attach: -> super