From 8c52fedd0daf92db12decd867d3e948140e7052c Mon Sep 17 00:00:00 2001 From: Nathan Sobo Date: Sun, 10 Jun 2012 21:53:54 -0600 Subject: [PATCH] Remove last of the extraneous CursorView methods --- spec/app/cursor-spec.coffee | 15 ++++++++------- src/app/cursor-view.coffee | 12 ------------ src/app/edit-session.coffee | 3 +++ src/app/editor.coffee | 1 + 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/spec/app/cursor-spec.coffee b/spec/app/cursor-spec.coffee index 5d61e016a..e7866529d 100644 --- a/spec/app/cursor-spec.coffee +++ b/spec/app/cursor-spec.coffee @@ -5,32 +5,33 @@ _ = require 'underscore' fs = require 'fs' describe "Cursor", -> - [buffer, editor, cursor] = [] + [buffer, editor, cursorView, cursor] = [] beforeEach -> buffer = new Buffer(require.resolve('fixtures/sample.js')) editor = new Editor editor.enableKeymap() editor.setBuffer(buffer) - cursor = editor.getCursorView() + cursor = editor.getCursor() + cursorView = editor.getCursorView() describe "adding and removing of the idle class", -> it "removes the idle class while moving, then adds it back when it stops", -> advanceClock(200) - expect(cursor).toHaveClass 'idle' + expect(cursorView).toHaveClass 'idle' cursor.setScreenPosition([1, 2]) - expect(cursor).not.toHaveClass 'idle' + expect(cursorView).not.toHaveClass 'idle' window.advanceClock(200) - expect(cursor).toHaveClass 'idle' + expect(cursorView).toHaveClass 'idle' cursor.setScreenPosition([1, 3]) advanceClock(100) cursor.setScreenPosition([1, 4]) advanceClock(100) - expect(cursor).not.toHaveClass 'idle' + expect(cursorView).not.toHaveClass 'idle' advanceClock(100) - expect(cursor).toHaveClass 'idle' + expect(cursorView).toHaveClass 'idle' diff --git a/src/app/cursor-view.coffee b/src/app/cursor-view.coffee index 7210dac62..1d04dc455 100644 --- a/src/app/cursor-view.coffee +++ b/src/app/cursor-view.coffee @@ -9,7 +9,6 @@ class CursorView extends View @content: -> @pre class: 'cursor idle', => @raw ' ' - anchor: null editor: null hidden: false @@ -47,23 +46,12 @@ class CursorView extends View @show() if @hidden @hidden = false - @getSelectionView()?.updateAppearance() - - getSelectionView: -> - @editor.compositeSelection.selectionViewForCursor(@cursor) - getBufferPosition: -> @cursor.getBufferPosition() - setBufferPosition: (bufferPosition, options={}) -> - @cursor.setBufferPosition(bufferPosition, options) - getScreenPosition: -> @cursor.getScreenPosition() - setScreenPosition: (position, options={}) -> - @cursor.setScreenPosition(position, options) - removeIdleClassTemporarily: -> @removeClass 'idle' window.clearTimeout(@idleTimeout) if @idleTimeout diff --git a/src/app/edit-session.coffee b/src/app/edit-session.coffee index 11a79390f..cc18bfd89 100644 --- a/src/app/edit-session.coffee +++ b/src/app/edit-session.coffee @@ -155,6 +155,9 @@ class EditSession getCursors: -> new Array(@cursors...) + getCursor: (index=0) -> + @cursors[index] + getLastCursor: -> _.last(@cursors) diff --git a/src/app/editor.coffee b/src/app/editor.coffee index 5d9154628..530b2fdab 100644 --- a/src/app/editor.coffee +++ b/src/app/editor.coffee @@ -653,6 +653,7 @@ class Editor extends View getCursorView: (index) -> @compositeCursor.getCursorView(index) getCursorViews: -> @compositeCursor.getCursorViews() removeAllCursorViews: -> @compositeCursor.removeAllCursorViews() + getCursor: (index) -> @activeEditSession.getCursor(index) getCursors: -> @activeEditSession.getCursors() getLastCursor: -> @activeEditSession.getLastCursor() moveCursorUp: -> @activeEditSession.moveCursorUp()