From 33053b08b455350bc07f1de9405dc7f4f8915c98 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 5 Jun 2012 11:51:46 -0700 Subject: [PATCH 1/3] :lipstick: --- src/extensions/autocomplete.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/extensions/autocomplete.coffee b/src/extensions/autocomplete.coffee index 82127a91b..8391a4dd1 100644 --- a/src/extensions/autocomplete.coffee +++ b/src/extensions/autocomplete.coffee @@ -54,7 +54,7 @@ class Autocomplete extends View @cancel() @miniEditor.buffer.on 'change', (e) => - @filterMatches() if @parent()[0] + @filterMatches() if @hasParent() @miniEditor.preempt 'move-up', => @selectPreviousMatch() From 4b68fa3caef1346f673f87dd897c00110ab50702 Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 5 Jun 2012 11:53:29 -0700 Subject: [PATCH 2/3] Remove detach recursion from autocomplete cancel. miniEditor.focusOut was causing cancel to be called multiple times. --- src/extensions/autocomplete.coffee | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/extensions/autocomplete.coffee b/src/extensions/autocomplete.coffee index 8391a4dd1..2f3023bd0 100644 --- a/src/extensions/autocomplete.coffee +++ b/src/extensions/autocomplete.coffee @@ -100,7 +100,8 @@ class Autocomplete extends View attach: -> @confirmed = false - @miniEditor.on 'focusout', => @cancel() unless @confirmed + @miniEditor.on 'focusout', => + @cancel() unless @confirmed @originalSelectedText = @editor.getSelectedText() @originalSelectionBufferRange = @editor.getSelection().getBufferRange() @@ -116,9 +117,10 @@ class Autocomplete extends View @miniEditor.focus() detach: -> + @miniEditor.off("focusout") + super @editor.off(".autocomplete") @editor.focus() - super @miniEditor.buffer.setText('') setPosition: (originalCursorPosition) -> From 3792d24c9fe21ab72f3f7a7f6a77064e224136df Mon Sep 17 00:00:00 2001 From: Corey Johnson Date: Tue, 5 Jun 2012 12:10:35 -0700 Subject: [PATCH 3/3] Mini editor's don't toggle active-editor-path-change event --- src/app/root-view.coffee | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/root-view.coffee b/src/app/root-view.coffee index daa574feb..7ab1e92c9 100644 --- a/src/app/root-view.coffee +++ b/src/app/root-view.coffee @@ -106,13 +106,13 @@ class RootView extends View makeEditorActive: (editor) -> previousActiveEditor = @panes.find('.editor.active').view() previousActiveEditor?.removeClass('active').off('.root-view') - editor - .addClass('active') - .on 'editor-path-change.root-view', => - @trigger 'active-editor-path-change', editor.buffer.path + editor.addClass('active') - if not previousActiveEditor or editor.buffer.path != previousActiveEditor.buffer.path - @trigger 'active-editor-path-change', editor.buffer.path + if not editor.mini + editor.on 'editor-path-change.root-view', => + @trigger 'active-editor-path-change', editor.buffer.path + if not previousActiveEditor or editor.buffer.path != previousActiveEditor.buffer.path + @trigger 'active-editor-path-change', editor.buffer.path activeKeybindings: -> keymap.bindingsForElement(document.activeElement)