github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Ignore scroll requests to NaN, null or undefined positions

Browse Source
This commit is contained in:
Antonio Scandurra
2017-08-17 09:17:52 +02:00
parent cd8233028d
commit 1b5ed62e4f
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
spec/text-editor-component-spec.js
View File

@@ -1296,6 +1296,38 @@ describe('TextEditorComponent', () => {
})
})
describe('scrolling via the API', () => {
it('ignores scroll requests to NaN, null or undefined positions', async () => {
const {component, element, editor} = buildComponent({rowsPerTile: 2, autoHeight: false})
await setEditorHeightInLines(component, 3)
await setEditorWidthInCharacters(component, 10)
const initialScrollTop = Math.round(2 * component.getLineHeight())
const initialScrollLeft = Math.round(5 * component.getBaseCharacterWidth())
setScrollTop(component, initialScrollTop)
setScrollLeft(component, initialScrollLeft)
await component.getNextUpdatePromise()
setScrollTop(component, NaN)
setScrollLeft(component, NaN)
await component.getNextUpdatePromise()
expect(component.getScrollTop()).toBe(initialScrollTop)
expect(component.getScrollLeft()).toBe(initialScrollLeft)
setScrollTop(component, null)
setScrollLeft(component, null)
await component.getNextUpdatePromise()
expect(component.getScrollTop()).toBe(initialScrollTop)
expect(component.getScrollLeft()).toBe(initialScrollLeft)
setScrollTop(component, undefined)
setScrollLeft(component, undefined)
await component.getNextUpdatePromise()
expect(component.getScrollTop()).toBe(initialScrollTop)
expect(component.getScrollLeft()).toBe(initialScrollLeft)
})
})
describe('line and line number decorations', () => {
it('adds decoration classes on screen lines spanned by decorated markers', async () => {
const {component, element, editor} = buildComponent({softWrapped: true})

4
src/text-editor-component.js
View File

@@ -2715,6 +2715,8 @@ class TextEditorComponent {
}
setScrollTop (scrollTop) {
if (Number.isNaN(scrollTop) || scrollTop == null) return false
scrollTop = Math.round(Math.max(0, Math.min(this.getMaxScrollTop(), scrollTop)))
if (scrollTop !== this.scrollTop) {
this.derivedDimensionsCache = {}
@@ -2744,6 +2746,8 @@ class TextEditorComponent {
}
setScrollLeft (scrollLeft) {
if (Number.isNaN(scrollLeft) || scrollLeft == null) return false
scrollLeft = Math.round(Math.max(0, Math.min(this.getMaxScrollLeft(), scrollLeft)))
if (scrollLeft !== this.scrollLeft) {
this.scrollLeftPending = true