mirror of
https://github.com/atom/atom.git
synced 2026-02-11 23:25:03 -05:00
Allow scrollPastEnd to be updated in TextEditor.prototype.update
This commit is contained in:
@@ -100,7 +100,7 @@ describe "TextEditor", ->
|
||||
editor.onDidChange(changeSpy = jasmine.createSpy('onDidChange'))
|
||||
editor.update({
|
||||
tabLength: 6, softTabs: false, softWrapped: true, editorWidthInChars: 40,
|
||||
ignoreInvisibles: true, mini: false, lineNumberGutterVisible: false
|
||||
ignoreInvisibles: true, mini: false, lineNumberGutterVisible: false, scrollPastEnd: true
|
||||
})
|
||||
expect(changeSpy.callCount).toBe(1)
|
||||
expect(editor.getTabLength()).toBe(6)
|
||||
@@ -110,6 +110,7 @@ describe "TextEditor", ->
|
||||
expect(editor.getInvisibles()).toEqual({})
|
||||
expect(editor.isMini()).toBe(false)
|
||||
expect(editor.isLineNumberGutterVisible()).toBe(false)
|
||||
expect(editor.getScrollPastEnd()).toBe(true)
|
||||
|
||||
describe "config defaults", ->
|
||||
it "uses the `editor.tabLength`, `editor.softWrap`, and `editor.softTabs`, and `core.fileEncoding` config values", ->
|
||||
|
||||
@@ -189,7 +189,7 @@ class TextEditor extends Model
|
||||
update: (params) ->
|
||||
{
|
||||
softTabs, tabLength, softWrapped, mini, placeholderText, lineNumberGutterVisible,
|
||||
showInvisibles, ignoreInvisibles, editorWidthInChars
|
||||
showInvisibles, ignoreInvisibles, editorWidthInChars, scrollPastEnd
|
||||
} = params
|
||||
|
||||
resetDisplayLayer = false
|
||||
@@ -226,6 +226,9 @@ class TextEditor extends Model
|
||||
@setEditorWidthInChars(editorWidthInChars, false)
|
||||
resetDisplayLayer = true
|
||||
|
||||
if scrollPastEnd? and scrollPastEnd isnt @scrollPastEnd
|
||||
@setScrollPastEnd(scrollPastEnd)
|
||||
|
||||
if resetDisplayLayer
|
||||
@resetDisplayLayer()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user