hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-06 10:01:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

scrolling.ts: Fix Tridactyl failing to scroll on non-html pages

Browse source 
The reason Tridactyl was unable to scroll on
https://www.haiku-os.org/docs/HIG/index.xml is that when it tried to set
this.elem.style.scrollBehavior to "unset", an exception was thrown
because non-html elements do not have a style attribute.

This is fixed by making sure the attempt to change scrollBehavior is
only performed if the element has a style attribute.
This commit is contained in:
glacambre 2018-11-18 13:31:52 +01:00
parent 704e1e572d
commit d916d16d85
No known key found for this signature in database
GPG key ID: B9625DB1767553AC
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/content/scrolling.ts
View file

@ -92,7 +92,8 @@ class ScrollingData {
this.duration = duration
// If we're already scrolling we don't need to try to scroll
if (this.scrolling) return true
;(this.elem as any).style.scrollBehavior = "unset"
if ("style" in this.elem)
(this.elem as any).style.scrollBehavior = "unset"
this.scrolling = this.scrollStep()
if (this.scrolling)
// If the element can be scrolled, scroll until animation completion
@ -154,7 +155,7 @@ export async function recursiveScroll(
x: number,
y: number,
node: Element = undefined,
stopAt: Element = undefined
stopAt: Element = undefined,
) {
let startingFromCached = false
if (!node) {
@ -171,7 +172,15 @@ export async function recursiveScroll(
let treeWalker = document.createTreeWalker(node, NodeFilter.SHOW_ELEMENT)
do {
// If node is undefined or if we managed to scroll it
if ((await scroll(x, y, treeWalker.currentNode)) || ((treeWalker.currentNode as any).contentDocument && (await recursiveScroll(x, y, (treeWalker.currentNode as any).contentDocument.body)))) {
if (
(await scroll(x, y, treeWalker.currentNode)) ||
((treeWalker.currentNode as any).contentDocument &&
(await recursiveScroll(
x,
y,
(treeWalker.currentNode as any).contentDocument.body,
)))
) {
// Cache the node for next time and stop trying to scroll
lastRecursiveScrolled = treeWalker.currentNode
lastX = x