From 36b0aa01265d9f4b5fd80cffb8085b351c368dd0 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Wed, 23 Sep 2015 18:45:32 +0200 Subject: [PATCH] :fire: --- spec/text-editor-component-spec.coffee | 4 ++-- src/text-editor-element.coffee | 3 --- src/text-editor-presenter.coffee | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/spec/text-editor-component-spec.coffee b/spec/text-editor-component-spec.coffee index 74abcadb9..05936f1d8 100644 --- a/spec/text-editor-component-spec.coffee +++ b/spec/text-editor-component-spec.coffee @@ -3453,14 +3453,14 @@ describe "TextEditorComponent", -> expect(wrapperNode.getScrollTop()).toBe 0 expect(wrapperNode.getScrollLeft()).toBe 0 - wrapperNode.scrollToCursorPosition() + editor.scrollToCursorPosition() nextAnimationFrame() expect(wrapperNode.getScrollTop()).toBe (8.8 * 10) - 30 expect(wrapperNode.getScrollBottom()).toBe (8.3 * 10) + 30 expect(wrapperNode.getScrollRight()).toBe (9 + editor.getHorizontalScrollMargin()) * 10 wrapperNode.setScrollTop(0) - wrapperNode.scrollToCursorPosition(center: false) + editor.scrollToCursorPosition(center: false) expect(wrapperNode.getScrollTop()).toBe (7.8 - editor.getVerticalScrollMargin()) * 10 expect(wrapperNode.getScrollBottom()).toBe (9.3 + editor.getVerticalScrollMargin()) * 10 diff --git a/src/text-editor-element.coffee b/src/text-editor-element.coffee index 9d139eb11..03ed3c422 100644 --- a/src/text-editor-element.coffee +++ b/src/text-editor-element.coffee @@ -237,9 +237,6 @@ class TextEditorElement extends HTMLElement scrollToBottom: -> @setScrollBottom(Infinity) - scrollToCursorPosition: (options) -> - @getModel().getLastCursor().autoscroll(center: options?.center ? true) - getScrollTop: -> @component.getScrollTop() diff --git a/src/text-editor-presenter.coffee b/src/text-editor-presenter.coffee index 9474e9c5f..922f06805 100644 --- a/src/text-editor-presenter.coffee +++ b/src/text-editor-presenter.coffee @@ -1552,14 +1552,12 @@ class TextEditorPresenter if scrollLeft isnt @scrollLeft and not Number.isNaN(scrollLeft) @realScrollLeft = scrollLeft @scrollLeft = Math.round(scrollLeft) - @model.setScrollLeft(@scrollLeft) commitPendingScrollTopPosition: -> scrollTop = @constrainScrollTop(@pendingScrollTop) if scrollTop isnt @scrollTop and not Number.isNaN(scrollTop) @realScrollTop = scrollTop @scrollTop = Math.round(scrollTop) - @model.setScrollTop(@scrollTop) updateScrollPosition: -> @commitPendingLogicalScrollPosition() if @pendingScrollLogicalPosition?