github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-24 22:38:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Wrap around the preview-list when moving up/down

Browse Source
This commit is contained in:
Kevin Sawicki
2013-01-04 08:59:20 -08:00
parent 7427d4e4ec
commit a891dec093
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/packages/command-panel/spec/command-panel-spec.coffee
View File

@@ -383,10 +383,6 @@ describe "CommandPanel", ->
expect(previewList.find('li.operation:eq(0)')).toHaveClass 'selected'
expect(previewList.getSelectedOperation()).toBe previewList.getOperations()[0]
previewList.trigger 'core:move-up'
expect(previewList.find('li.operation:eq(0)')).toHaveClass 'selected'
expect(previewList.getSelectedOperation()).toBe previewList.getOperations()[0]
previewList.trigger 'core:move-down'
expect(previewList.find('li.operation:eq(1)')).toHaveClass 'selected'
expect(previewList.getSelectedOperation()).toBe previewList.getOperations()[1]
@@ -399,7 +395,7 @@ describe "CommandPanel", ->
expect(previewList.find('li.operation:eq(1)')).toHaveClass 'selected'
expect(previewList.getSelectedOperation()).toBe previewList.getOperations()[1]
_.times previewList.getOperations().length, -> previewList.trigger 'core:move-down'
_.times previewList.getOperations().length - 2, -> previewList.trigger 'core:move-down'
expect(previewList.find("li.operation:last")).toHaveClass 'selected'
expect(previewList.getSelectedOperation()).toBe _.last(previewList.getOperations())
@@ -408,15 +404,28 @@ describe "CommandPanel", ->
_.times previewList.getOperations().length, -> previewList.trigger 'core:move-up'
it "wraps around when the list is at the beginning or end", ->
rootView.attachToDom()
expect(previewList.find('li.operation:eq(0)')).toHaveClass 'selected'
expect(previewList.getSelectedOperation()).toBe previewList.getOperations()[0]
previewList.trigger 'core:move-up'
expect(previewList.find('li.operation:last')).toHaveClass 'selected'
expect(previewList.getSelectedOperation()).toBe _.last(previewList.getOperations())
previewList.trigger 'core:move-down'
expect(previewList.find('li.operation:eq(0)')).toHaveClass 'selected'
expect(previewList.getSelectedOperation()).toBe previewList.getOperations()[0]
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.operation:eq(0)')).toHaveClass 'selected'
expect(previewList.find('li.operation:last')).toHaveClass 'selected'
expect(commandPanel.miniEditor.getText()).toBe 'command'
previewList.trigger 'core:move-down'
expect(previewList.find('li.operation:eq(1)')).toHaveClass 'selected'
expect(previewList.find('li.operation:eq(0)')).toHaveClass 'selected'
expect(commandPanel.miniEditor.getText()).toBe 'command'
describe "when core:confirm is triggered on the preview list", ->

10
src/packages/command-panel/src/preview-list.coffee
View File

@@ -56,10 +56,16 @@ class PreviewList extends ScrollView
lineNumbers.width(maxWidth)
selectNextOperation: ->
@setSelectedOperationIndex(@selectedOperationIndex + 1)
if @selectedOperationIndex is @operations.length - 1
@setSelectedOperationIndex(0)
else
@setSelectedOperationIndex(@selectedOperationIndex + 1)
selectPreviousOperation: ->
@setSelectedOperationIndex(@selectedOperationIndex - 1)
if @selectedOperationIndex is 0
@setSelectedOperationIndex(@operations.length - 1)
else
@setSelectedOperationIndex(@selectedOperationIndex - 1)
setSelectedOperationIndex: (index) ->
index = Math.max(0, index)