github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-02-11 23:25:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into event-palette

Browse Source 
Conflicts:
	src/app/editor.coffee
This commit is contained in:
Nathan Sobo
2012-10-05 11:09:17 -10:00
parent d4b6ba4c11 c09f7ebc60
commit e38367df8c
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/extensions/command-panel/command-panel.coffee
View File

@@ -62,9 +62,8 @@ class CommandPanel extends View
@rootView.on 'command-panel:repeat-relative-address-in-reverse', => @repeatRelativeAddressInReverse()
@rootView.on 'command-panel:set-selection-as-regex-address', => @setSelectionAsLastRelativeAddress()
@miniEditor.off 'move-up move-down'
@miniEditor.on 'move-up', => @navigateBackwardInHistory()
@miniEditor.on 'move-down', => @navigateForwardInHistory()
@on 'core:move-up', => @navigateBackwardInHistory()
@on 'core:move-down', => @navigateForwardInHistory()
@previewList.hide()

4
src/extensions/command-panel/preview-list.coffee
View File

@@ -10,8 +10,8 @@ class PreviewList extends View
operations: null
initialize: (@rootView) ->
@on 'move-down', => @selectNextOperation()
@on 'move-up', => @selectPreviousOperation()
@on 'core:move-down', => @selectNextOperation()
@on 'core:move-up', => @selectPreviousOperation()
@on 'command-panel:execute', => @executeSelectedOperation()
@on 'mousedown', 'li', (e) =>