From 6183680d152e972a5485eaf90713ef0da7d29779 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 17 Dec 2012 14:07:52 -0800 Subject: [PATCH] Don't bubble up up/down events triggered on preview list --- .../command-panel/spec/command-panel-spec.coffee | 11 +++++++++++ src/extensions/command-panel/src/preview-list.coffee | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/extensions/command-panel/spec/command-panel-spec.coffee b/src/extensions/command-panel/spec/command-panel-spec.coffee index 5872dfb25..1cfadab7f 100644 --- a/src/extensions/command-panel/spec/command-panel-spec.coffee +++ b/src/extensions/command-panel/spec/command-panel-spec.coffee @@ -407,6 +407,17 @@ describe "CommandPanel", -> _.times previewList.getOperations().length, -> previewList.trigger 'core:move-up' + it "doesn't bubble up the event and the command panel text doesn't change", -> + rootView.attachToDom() + commandPanel.miniEditor.setText "command" + previewList.focus() + previewList.trigger 'core:move-up' + expect(previewList.find('li:eq(0)')).toHaveClass 'selected' + expect(commandPanel.miniEditor.getText()).toBe 'command' + previewList.trigger 'core:move-down' + expect(previewList.find('li:eq(1)')).toHaveClass 'selected' + expect(commandPanel.miniEditor.getText()).toBe 'command' + describe "when core:confirm is triggered on the preview list", -> it "opens the operation's buffer, selects and scrolls to the search result, and focuses the active editor", -> rootView.height(200) diff --git a/src/extensions/command-panel/src/preview-list.coffee b/src/extensions/command-panel/src/preview-list.coffee index 44c1e1900..94a560c83 100644 --- a/src/extensions/command-panel/src/preview-list.coffee +++ b/src/extensions/command-panel/src/preview-list.coffee @@ -12,8 +12,8 @@ class PreviewList extends ScrollView initialize: (@rootView) -> super - @on 'core:move-down', => @selectNextOperation() - @on 'core:move-up', => @selectPreviousOperation() + @on 'core:move-down', => @selectNextOperation(); false + @on 'core:move-up', => @selectPreviousOperation(); false @on 'core:confirm', => @executeSelectedOperation() @on 'mousedown', 'li', (e) =>