hiro/tridactyl
1
0
Fork 0
mirror of https://github.com/vale981/tridactyl synced 2025-03-04 17:11:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix and optimize addJump scroll handler

Browse source 
It was reading properties that a scroll event does not have.

It was messaging the background page with an expensive call on every
scroll event. This slowed down the page unnecessarily.

Also extracted jumps.timeoutid to the content script scope.
This variable is not useful to others outside of the current content
script. Storing it locally means we can avoid expensive communication
with the background page and only do it once we're sure we need to add
a new entry to the jump list.
This commit is contained in:
Jakub Okoński 2019-08-23 16:05:08 +02:00 • committed by Oliver Blanthorn
parent 7e1888a683
commit bd2b988338
No known key found for this signature in database
GPG key ID: 2BB8C36BB504BFF3
1 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/excmds.ts
View file

@ -859,6 +859,10 @@ function tabSetActive(id: number) {
//#content_helper
let JUMPED: boolean
/** @hidden */
//#content_helper
let JUMP_TIMEOUTID
/** This is used as an ID for the current page in the jumplist.
It has a potentially confusing behavior: if you visit site A, then site B, then visit site A again, the jumplist that was created for your first visit on A will be re-used for your second visit.
An ideal solution would be to have a counter that is incremented every time a new page is visited within the tab and use that as the return value for getJumpPageId but this doesn't seem to be trivial to implement.
@ -941,35 +945,37 @@ export function jumpprev(n = 1) {
@hidden
*/
//#content_helper
export function addJump(scrollEvent: UIEvent) {
export function addJump() {
if (JUMPED) {
JUMPED = false
return
}
const pageX = scrollEvent.pageX
const pageY = scrollEvent.pageY
// Get config for current page
curJumps().then(alljumps => {
const {scrollX, scrollY} = window
// Prevent pending jump from being registered
clearTimeout(JUMP_TIMEOUTID)
// Schedule the registering of the current jump
const localTimeoutID = setTimeout(async () => {
// Get config for current page
const alljumps = await curJumps()
// if this handler was cancelled after the call to curJumps(), bail out
if (localTimeoutID !== JUMP_TIMEOUTID) return
const jumps = alljumps[getJumpPageId()]
// Prevent pending jump from being registered
clearTimeout(jumps.timeoutid)
// Schedule the registering of the current jump
jumps.timeoutid = setTimeout(() => {
const list = jumps.list
// if the page hasn't moved, stop
if (list[jumps.cur].x === pageX && list[jumps.cur].y === pageY) return
// Store the new jump
// Could removing all jumps from list[cur] to list[list.length] be
// a better/more intuitive behavior?
list.push({ x: pageX, y: pageY })
jumps.cur = jumps.list.length - 1
saveJumps(alljumps)
}, config.get("jumpdelay"))
})
const list = jumps.list
// if the page hasn't moved, stop
if (list[jumps.cur].x === scrollX && list[jumps.cur].y === scrollY) return
// Store the new jump
// Could removing all jumps from list[cur] to list[list.length] be
// a better/more intuitive behavior?
list.push({ x: scrollX, y: scrollY })
jumps.cur = jumps.list.length - 1
saveJumps(alljumps)
}, config.get("jumpdelay"))
JUMP_TIMEOUTID = localTimeoutID
}
//#content_helper
document.addEventListener("scroll", addJump)
document.addEventListener("scroll", addJump, {passive: true})
// Try to restore the previous jump position every time a page is loaded
//#content_helper