Prefix "move-*" events with "core:"

I want to prefix all custom events for better categorization and to
distinguish them from built-in webkit events
This commit is contained in:
Nathan Sobo 2012-10-04 10:35:27 -10:00
parent c30220ae80
commit 67c6ed8de7
8 changed files with 36 additions and 36 deletions

View File

@ -200,13 +200,13 @@ describe "Autocomplete", ->
editor.setCursorBufferPosition([10,6])
autocomplete.attach()
miniEditor.trigger "move-up"
miniEditor.trigger "core:move-up"
expect(editor.lineForBufferRow(10)).toBe "extra:concat:extra"
expect(autocomplete.find('li:eq(0)')).not.toHaveClass('selected')
expect(autocomplete.find('li:eq(1)')).not.toHaveClass('selected')
expect(autocomplete.find('li:eq(7)')).toHaveClass('selected')
miniEditor.trigger "move-up"
miniEditor.trigger "core:move-up"
expect(editor.lineForBufferRow(10)).toBe "extra:right:extra"
expect(autocomplete.find('li:eq(0)')).not.toHaveClass('selected')
expect(autocomplete.find('li:eq(7)')).not.toHaveClass('selected')
@ -223,10 +223,10 @@ describe "Autocomplete", ->
expect(matchesList.height()).toBeLessThan matchesList[0].scrollHeight
matchCount = matchesList.find('li').length
miniEditor.trigger 'move-up'
miniEditor.trigger 'core:move-up'
expect(matchesList.scrollBottom()).toBe matchesList[0].scrollHeight
miniEditor.trigger 'move-up' for i in [1...matchCount]
miniEditor.trigger 'core:move-up' for i in [1...matchCount]
expect(matchesList.scrollTop()).toBe 0
describe 'move-down event', ->
@ -235,12 +235,12 @@ describe "Autocomplete", ->
editor.setCursorBufferPosition([10,7])
autocomplete.attach()
miniEditor.trigger "move-down"
miniEditor.trigger "core:move-down"
expect(editor.lineForBufferRow(10)).toBe "extra:shift:extra"
expect(autocomplete.find('li:eq(0)')).not.toHaveClass('selected')
expect(autocomplete.find('li:eq(1)')).toHaveClass('selected')
miniEditor.trigger "move-down"
miniEditor.trigger "core:move-down"
expect(editor.lineForBufferRow(10)).toBe "extra:sort:extra"
expect(autocomplete.find('li:eq(0)')).toHaveClass('selected')
expect(autocomplete.find('li:eq(1)')).not.toHaveClass('selected')
@ -256,10 +256,10 @@ describe "Autocomplete", ->
expect(matchesList.height()).toBeLessThan matchesList[0].scrollHeight
matchCount = matchesList.find('li').length
miniEditor.trigger 'move-down' for i in [1...matchCount]
miniEditor.trigger 'core:move-down' for i in [1...matchCount]
expect(matchesList.scrollBottom()).toBe matchesList[0].scrollHeight
miniEditor.trigger 'move-down'
miniEditor.trigger 'core:move-down'
expect(matchesList.scrollTop()).toBe 0
describe "when a match is clicked in the match list", ->
@ -431,10 +431,10 @@ describe "Autocomplete", ->
autocomplete.detach()
expect(miniEditor.getText()).toBe ''
editor.trigger 'move-down'
editor.trigger 'core:move-down'
expect(editor.getCursorBufferPosition().row).toBe 1
editor.trigger 'move-up'
editor.trigger 'core:move-up'
expect(editor.getCursorBufferPosition().row).toBe 0

View File

@ -67,7 +67,7 @@ describe 'FuzzyFinder', ->
describe "when a path is highlighted", ->
it "opens the file associated with that path in the editor", ->
finder.trigger 'move-down'
finder.trigger 'core:move-down'
selectedLi = finder.find('li:eq(1)')
expectedPath = rootView.project.resolve(selectedLi.text())

View File

@ -91,10 +91,10 @@ class Editor extends View
bindKeys: ->
editorBindings =
'move-right': @moveCursorRight
'move-left': @moveCursorLeft
'move-down': @moveCursorDown
'move-up': @moveCursorUp
'core:move-right': @moveCursorRight
'core:move-left': @moveCursorLeft
'core:move-down': @moveCursorDown
'core:move-up': @moveCursorUp
'move-to-next-word': @moveCursorToNextWord
'move-to-previous-word': @moveCursorToPreviousWord
'select-right': @selectRight

View File

@ -1,10 +1,10 @@
window.keymap.bindKeys '*'
'meta-w': 'close'
'alt-meta-i': 'toggle-dev-tools'
right: 'move-right'
left: 'move-left'
down: 'move-down'
up: 'move-up'
right: 'core:move-right'
left: 'core:move-left'
down: 'core:move-down'
up: 'core:move-up'
pagedown: 'page-down'
pageup: 'page-up'
'meta-S': 'save-all'

View File

@ -1,8 +1,8 @@
window.keymap.bindKeys '*',
'ctrl-f': 'move-right'
'ctrl-b': 'move-left'
'ctrl-p': 'move-up'
'ctrl-n': 'move-down'
'ctrl-f': 'core:move-right'
'ctrl-b': 'core:move-left'
'ctrl-p': 'core:move-up'
'ctrl-n': 'core:move-down'
window.keymap.bindKeys '.editor',
'ctrl-F': 'select-right'

View File

@ -58,11 +58,11 @@ class Autocomplete extends View
@filterMatches()
@renderMatchList()
@miniEditor.preempt 'move-up', =>
@miniEditor.preempt 'core:move-up', =>
@selectPreviousMatch()
false
@miniEditor.preempt 'move-down', =>
@miniEditor.preempt 'core:move-down', =>
@selectNextMatch()
false

View File

@ -26,13 +26,13 @@ class FuzzyFinder extends View
@rootView.on 'fuzzy-finder:toggle-buffer-finder', => @toggleBufferFinder()
@on 'fuzzy-finder:cancel', => @detach()
@on 'move-up', => @moveUp()
@on 'move-down', => @moveDown()
@on 'core:move-up', => @moveUp()
@on 'core:move-down', => @moveDown()
@on 'fuzzy-finder:select-path', => @select()
@on 'mousedown', 'li', (e) => @entryClicked(e)
@miniEditor.getBuffer().on 'change', => @populatePathList() if @hasParent()
@miniEditor.off 'move-up move-down'
@miniEditor.off 'core:move-up core:move-down'
toggleFileFinder: ->
if @hasParent()

View File

@ -32,10 +32,10 @@ class VimMode
'i': 'insert'
'd': 'delete'
'x': 'delete-right'
'h': 'move-left'
'j': 'move-down'
'k': 'move-up'
'l': 'move-right'
'h': 'core:move-left'
'j': 'core:move-down'
'k': 'core:move-up'
'l': 'core:move-right'
'w': 'move-to-next-word'
'b': 'move-to-previous-word'
'}': 'move-to-next-paragraph'
@ -47,10 +47,10 @@ class VimMode
'insert': => @activateInsertMode()
'delete': => @delete()
'delete-right': => new commands.DeleteRight(@editor)
'move-left': => new motions.MoveLeft(@editor)
'move-up': => new motions.MoveUp(@editor)
'move-down': => new motions.MoveDown @editor
'move-right': => new motions.MoveRight @editor
'core:move-left': => new motions.MoveLeft(@editor)
'core:move-up': => new motions.MoveUp(@editor)
'core:move-down': => new motions.MoveDown @editor
'core:move-right': => new motions.MoveRight @editor
'move-to-next-word': => new motions.MoveToNextWord(@editor)
'move-to-previous-word': => new motions.MoveToPreviousWord(@editor)
'move-to-next-paragraph': => new motions.MoveToNextParagraph(@editor)