From d4b6ba4c111b214519ddbfdb8c4ef67e835747fc Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Fri, 5 Oct 2012 10:43:24 -1000 Subject: [PATCH] Make SelectList handle prefixed move-up and move-down events --- spec/extensions/select-list-spec.coffee | 26 ++++++++++++------------- src/app/select-list.coffee | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/spec/extensions/select-list-spec.coffee b/spec/extensions/select-list-spec.coffee index 47bd780c7..49001c30a 100644 --- a/spec/extensions/select-list-spec.coffee +++ b/spec/extensions/select-list-spec.coffee @@ -37,31 +37,31 @@ describe "SelectList", -> expect(list.find('li:contains(Delta)')).toExist() expect(list.find('li:first')).toHaveClass 'selected' - describe "when move-up / move-down are triggered on the miniEditor", -> + describe "when core:move-up / core:move-down are triggered on the miniEditor", -> it "selects the previous / next item in the list, or wraps around to the other side", -> expect(list.find('li:first')).toHaveClass 'selected' - miniEditor.trigger 'move-up' + miniEditor.trigger 'core:move-up' expect(list.find('li:first')).not.toHaveClass 'selected' expect(list.find('li:last')).toHaveClass 'selected' - miniEditor.trigger 'move-down' + miniEditor.trigger 'core:move-down' expect(list.find('li:first')).toHaveClass 'selected' expect(list.find('li:last')).not.toHaveClass 'selected' - miniEditor.trigger 'move-down' + miniEditor.trigger 'core:move-down' expect(list.find('li:eq(0)')).not.toHaveClass 'selected' expect(list.find('li:eq(1)')).toHaveClass 'selected' - miniEditor.trigger 'move-down' + miniEditor.trigger 'core:move-down' expect(list.find('li:eq(1)')).not.toHaveClass 'selected' expect(list.find('li:eq(2)')).toHaveClass 'selected' - miniEditor.trigger 'move-up' + miniEditor.trigger 'core:move-up' expect(list.find('li:eq(2)')).not.toHaveClass 'selected' expect(list.find('li:eq(1)')).toHaveClass 'selected' @@ -71,22 +71,22 @@ describe "SelectList", -> itemHeight = list.find('li').outerHeight() list.height(itemHeight * 2) - miniEditor.trigger 'move-down' - miniEditor.trigger 'move-down' + miniEditor.trigger 'core:move-down' + miniEditor.trigger 'core:move-down' expect(list.scrollBottom()).toBe itemHeight * 3 - miniEditor.trigger 'move-down' + miniEditor.trigger 'core:move-down' expect(list.scrollBottom()).toBe itemHeight * 4 - miniEditor.trigger 'move-up' - miniEditor.trigger 'move-up' + miniEditor.trigger 'core:move-up' + miniEditor.trigger 'core:move-up' expect(list.scrollBottom()).toBe itemHeight * 3 describe "the core:confirm event", -> describe "when there is an item selected (because the list in not empty)", -> it "triggers the selected hook with the selected array element", -> - miniEditor.trigger 'move-down' - miniEditor.trigger 'move-down' + miniEditor.trigger 'core:move-down' + miniEditor.trigger 'core:move-down' miniEditor.trigger 'core:confirm' expect(selectList.confirmed).toHaveBeenCalledWith(array[2]) diff --git a/src/app/select-list.coffee b/src/app/select-list.coffee index bde58b11d..21a631450 100644 --- a/src/app/select-list.coffee +++ b/src/app/select-list.coffee @@ -21,8 +21,8 @@ class SelectList extends View @miniEditor.getBuffer().on 'change', => @populateList() @miniEditor.on 'focusout', => @cancel() unless @cancelling - @on 'move-up', => @selectPreviousItem() - @on 'move-down', => @selectNextItem() + @on 'core:move-up', => @selectPreviousItem() + @on 'core:move-down', => @selectNextItem() @on 'core:confirm', => @confirmSelection() @on 'core:cancel', => @cancel()