mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-26 03:27:18 +00:00
Code Issues Releases Wiki Activity

Scrollable hotfix: Avoid setTimeout

Browse Source 
See #7869
This commit is contained in:
Jeremy Ruston 2023-12-02 08:58:35 +00:00
parent e60ddf0b0a
commit 4e67aafeb7
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/modules/widgets/scrollable.js
View File

@ -176,7 +176,7 @@ ScrollableWidget.prototype.render = function(parent,nextSibling) {
// If the scroll position is bound to a tiddler // If the scroll position is bound to a tiddler
if(this.scrollableBind) { if(this.scrollableBind) {
// After a delay for rendering, scroll to the bound position // After a delay for rendering, scroll to the bound position
setTimeout(this.updateScrollPositionFromBoundTiddler.bind(this),50); this.updateScrollPositionFromBoundTiddler();
// Set up event listener // Set up event listener
this.currentListener = this.listenerFunction.bind(this); this.currentListener = this.listenerFunction.bind(this);
this.outerDomNode.addEventListener("scroll", this.currentListener); this.outerDomNode.addEventListener("scroll", this.currentListener);
@ -251,13 +251,14 @@ ScrollableWidget.prototype.refresh = function(changedTiddlers) {
this.scrollableBind = this.getAttribute("bind"); this.scrollableBind = this.getAttribute("bind");
this.currentListener = this.listenerFunction.bind(this); this.currentListener = this.listenerFunction.bind(this);
this.outerDomNode.addEventListener("scroll", this.currentListener); this.outerDomNode.addEventListener("scroll", this.currentListener);
setTimeout(this.updateScrollPositionFromBoundTiddler.bind(this),50);
} }
// If a new scroll position was written into the tiddler, update scroll position // Refresh children
if(changedTiddlers[this.getAttribute("bind")]) { var result = this.refreshChildren(changedTiddlers);
setTimeout(this.updateScrollPositionFromBoundTiddler.bind(this),50); // If the bound tiddler has changed, update scroll position
if(changedAttributes["bind"] || changedTiddlers[this.getAttribute("bind")]) {
this.updateScrollPositionFromBoundTiddler();
} }
return this.refreshChildren(changedTiddlers); return result;
}; };
exports.scrollable = ScrollableWidget; exports.scrollable = ScrollableWidget;