valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Article.cdmScrollToId: disable smooth scrolling on repeated events

This commit is contained in:
Andrew Dolgov 2019-12-10 08:51:45 +03:00
parent dad3d1c7a9
commit 560346f9d1
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/Article.js
View File

@ -275,7 +275,7 @@ define(["dojo/_base/declare"], function (declare) {
dialog.show(); dialog.show();
}, },
cdmScrollToId: function (id, force) { cdmScrollToId: function (id, force, event) {
const ctr = $("headlines-frame"); const ctr = $("headlines-frame");
const e = $("RROW-" + id); const e = $("RROW-" + id);
@ -284,6 +284,18 @@ define(["dojo/_base/declare"], function (declare) {
if (force || e.offsetTop + e.offsetHeight > (ctr.scrollTop + ctr.offsetHeight) || if (force || e.offsetTop + e.offsetHeight > (ctr.scrollTop + ctr.offsetHeight) ||
e.offsetTop < ctr.scrollTop) { e.offsetTop < ctr.scrollTop) {
if (event && event.repeat) {
ctr.addClassName("forbid-smooth-scroll");
window.clearTimeout(this._scroll_reset_timeout);
this._scroll_reset_timeout = window.setTimeout(() => {
if (ctr) ctr.removeClassName("forbid-smooth-scroll");
}, 250)
} else {
ctr.removeClassName("forbid-smooth-scroll");
}
ctr.scrollTop = e.offsetTop; ctr.scrollTop = e.offsetTop;
Element.hide("floatingTitle"); Element.hide("floatingTitle");

6
js/Headlines.js
View File

@ -868,7 +868,7 @@ define(["dojo/_base/declare"], function (declare) {
Article.scroll(ctr.offsetHeight / 2, event); Article.scroll(ctr.offsetHeight / 2, event);
} else if (next_id) { } else if (next_id) {
Article.setActive(next_id); Article.setActive(next_id);
Article.cdmScrollToId(next_id, true); Article.cdmScrollToId(next_id, true, event);
} }
} else if (next_id) { } else if (next_id) {
@ -890,10 +890,10 @@ define(["dojo/_base/declare"], function (declare) {
Article.scroll(-ctr.offsetHeight / 2, event); Article.scroll(-ctr.offsetHeight / 2, event);
} else { } else {
if (row.offsetTop < ctr.scrollTop) { if (row.offsetTop < ctr.scrollTop) {
Article.cdmScrollToId(Article.getActive(), noscroll); Article.cdmScrollToId(Article.getActive(), noscroll, event);
} else if (prev_id) { } else if (prev_id) {
Article.setActive(prev_id); Article.setActive(prev_id);
Article.cdmScrollToId(prev_id, noscroll); Article.cdmScrollToId(prev_id, noscroll, event);
} }
} }