From 3e77b9b7c03f8760f8af1eceea9722894912c044 Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Thu, 4 Sep 2014 09:52:14 -0600 Subject: [PATCH] Eliminate Editor::onDidMoveCursor If you want to know if a cursor moved, subscribe to the cursor. --- src/editor-component.coffee | 6 +++++- src/editor.coffee | 4 ---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/editor-component.coffee b/src/editor-component.coffee index e3ec24442..847aa9d57 100644 --- a/src/editor-component.coffee +++ b/src/editor-component.coffee @@ -346,7 +346,7 @@ EditorComponent = React.createClass observeEditor: -> {editor} = @props @subscribe editor, 'screen-lines-changed', @onScreenLinesChanged - @subscribe editor.onDidMoveCursor(@onCursorMoved) + @subscribe editor.onDidAddCursor(@onCursorAdded) @subscribe editor, 'selection-removed selection-screen-range-changed', @onSelectionChanged @subscribe editor, 'selection-added', @onSelectionAdded @subscribe editor, 'decoration-added', @onDecorationChanged @@ -749,6 +749,10 @@ EditorComponent = React.createClass onStoppedScrollingAfterDelay: null # created lazily + onCursorAdded: (cursor) -> + @subscribe cursor, 'moved', @onCursorMoved + @subscribe cursor, 'destroyed', => @unsubscribe(cursor) + onCursorMoved: -> @cursorMoved = true @requestUpdate() diff --git a/src/editor.coffee b/src/editor.coffee index 62fe65982..dfd355679 100644 --- a/src/editor.coffee +++ b/src/editor.coffee @@ -318,9 +318,6 @@ class Editor extends Model onDidInsertText: (callback) -> @emitter.on 'did-insert-text', callback - onDidMoveCursor: (callback) -> - @emitter.on 'did-move-cursor', callback - onDidAddCursor: (callback) -> @emitter.on 'did-add-cursor', callback @@ -1863,7 +1860,6 @@ class Editor extends Model cursorMoved: (cursor, event) -> @emit 'cursor-moved', event - @emitter.emit 'did-move-cursor', _.extend({cursor}, event) # Merge cursors that have the same screen position mergeCursors: ->