diff --git a/spec/extensions/autocomplete-spec.coffee b/spec/extensions/autocomplete-spec.coffee index dec2a7d98..d9adea327 100644 --- a/spec/extensions/autocomplete-spec.coffee +++ b/spec/extensions/autocomplete-spec.coffee @@ -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 diff --git a/spec/extensions/fuzzy-finder-spec.coffee b/spec/extensions/fuzzy-finder-spec.coffee index fd1b3e774..76d63d9f4 100644 --- a/spec/extensions/fuzzy-finder-spec.coffee +++ b/spec/extensions/fuzzy-finder-spec.coffee @@ -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()) diff --git a/src/app/editor.coffee b/src/app/editor.coffee index bbac15e95..c431fcb0b 100644 --- a/src/app/editor.coffee +++ b/src/app/editor.coffee @@ -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 diff --git a/src/app/keymaps/atom.coffee b/src/app/keymaps/atom.coffee index 5f2db2507..4aeae6889 100644 --- a/src/app/keymaps/atom.coffee +++ b/src/app/keymaps/atom.coffee @@ -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' diff --git a/src/app/keymaps/emacs.coffee b/src/app/keymaps/emacs.coffee index 5ece06a79..7ab113ea7 100644 --- a/src/app/keymaps/emacs.coffee +++ b/src/app/keymaps/emacs.coffee @@ -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' diff --git a/src/extensions/autocomplete/autocomplete.coffee b/src/extensions/autocomplete/autocomplete.coffee index e6eecb30e..b38ff7ca2 100644 --- a/src/extensions/autocomplete/autocomplete.coffee +++ b/src/extensions/autocomplete/autocomplete.coffee @@ -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 diff --git a/src/extensions/fuzzy-finder/fuzzy-finder.coffee b/src/extensions/fuzzy-finder/fuzzy-finder.coffee index 70206338b..3e75dd98c 100644 --- a/src/extensions/fuzzy-finder/fuzzy-finder.coffee +++ b/src/extensions/fuzzy-finder/fuzzy-finder.coffee @@ -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() diff --git a/src/extensions/vim-mode/index.coffee b/src/extensions/vim-mode/index.coffee index 7391ddfe3..abeaf11c1 100644 --- a/src/extensions/vim-mode/index.coffee +++ b/src/extensions/vim-mode/index.coffee @@ -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)