mirrors/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/fox/tt-rss.git synced 2025-08-07 06:37:44 +02:00
Code Issues Projects Releases Wiki Activity

Headlines.move: maybe glitch less when moving back to top, etc

Browse Source
This commit is contained in:
Andrew Dolgov 2020-05-17 16:04:31 +03:00
parent cd1f3cb8cc
commit 05a84ab778
3 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/AppBase.js
View File

@ -33,6 +33,18 @@ define(["dojo/_base/declare"], function (declare) {
elem.scrollTop += offset; elem.scrollTop += offset;
}, },
isChildVisible: function(elem, ctr) {
if (!elem) return;
const ctop = ctr.scrollTop;
const cbottom = ctop + ctr.offsetHeight;
const etop = elem.offsetTop;
const ebottom = etop + elem.offsetHeight;
return etop >= ctop && ebottom <= cbottom ||
etop < ctop && ebottom > ctop || ebottom > cbottom && etop < cbottom;
},
}, },
constructor: function() { constructor: function() {
window.onerror = this.Error.onWindowError; window.onerror = this.Error.onWindowError;

24
js/Article.js
View File

@ -322,22 +322,24 @@ define(["dojo/_base/declare"], function (declare) {
} }
}, },
setActive: function (id) { setActive: function (id) {
console.log("setActive", id); if (id != Article.getActive()) {
console.log("setActive", id, "was", Article.getActive());
$$("div[id*=RROW][class*=active]").each((row) => { $$("div[id*=RROW][class*=active]").each((row) => {
row.removeClassName("active"); row.removeClassName("active");
Article.pack(row); Article.pack(row);
}); });
const row = $("RROW-" + id); const row = $("RROW-" + id);
if (row) { if (row) {
Article.unpack(row); Article.unpack(row);
row.removeClassName("Unread"); row.removeClassName("Unread");
row.addClassName("active"); row.addClassName("active");
PluginHost.run(PluginHost.HOOK_ARTICLE_SET_ACTIVE, row.getAttribute("data-article-id")); PluginHost.run(PluginHost.HOOK_ARTICLE_SET_ACTIVE, row.getAttribute("data-article-id"));
}
} }
}, },
getActive: function () { getActive: function () {

42
js/Headlines.js
View File

@ -272,25 +272,16 @@ define(["dojo/_base/declare"], function (declare) {
Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat(), offset: offset, append: true}); Feeds.open({feed: Feeds.getActive(), is_cat: Feeds.activeIsCat(), offset: offset, append: true});
}, },
isChildVisible: function (elem, ctr) { isChildVisible: function (elem) {
const ctop = ctr.scrollTop; return App.Scrollable.isChildVisible(elem, $("headlines-frame"));
const cbottom = ctop + ctr.offsetHeight;
const etop = elem.offsetTop;
const ebottom = etop + elem.offsetHeight;
return etop >= ctop && ebottom <= cbottom ||
etop < ctop && ebottom > ctop || ebottom > cbottom && etop < cbottom
}, },
firstVisible: function () { firstVisible: function () {
const rows = $$("#headlines-frame > div[id*=RROW]"); const rows = $$("#headlines-frame > div[id*=RROW]");
const ctr = $("headlines-frame");
for (let i = 0; i < rows.length; i++) { for (let i = 0; i < rows.length; i++) {
const row = rows[i]; const row = rows[i];
if (this.isChildVisible(row, ctr)) { if (this.isChildVisible(row)) {
return row.getAttribute("data-article-id"); return row.getAttribute("data-article-id");
} }
} }
@ -809,26 +800,24 @@ define(["dojo/_base/declare"], function (declare) {
let prev_id = false; let prev_id = false;
let next_id = false; let next_id = false;
let current_id = Article.getActive();
const active_row = $("RROW-" + Article.getActive()); if (!Headlines.isChildVisible($("RROW-" + current_id))) {
console.log('active article is obscured, resetting to first visible...');
if (!active_row) current_id = Headlines.firstVisible();
Article.setActive(0); prev_id = current_id;
next_id = current_id;
if (!Article.getActive() || (active_row && !Headlines.isChildVisible(active_row, $("headlines-frame")))) {
next_id = Headlines.firstVisible();
prev_id = next_id;
} else { } else {
const rows = Headlines.getLoaded(); const rows = Headlines.getLoaded();
for (let i = 0; i < rows.length; i++) { for (let i = 0; i < rows.length; i++) {
if (rows[i] == Article.getActive()) { if (rows[i] == current_id) {
// Account for adjacent identical article ids. // Account for adjacent identical article ids.
if (i > 0) prev_id = rows[i - 1]; if (i > 0) prev_id = rows[i - 1];
for (let j = i + 1; j < rows.length; j++) { for (let j = i + 1; j < rows.length; j++) {
if (rows[j] != Article.getActive()) { if (rows[j] != current_id) {
next_id = rows[j]; next_id = rows[j];
break; break;
} }
@ -838,7 +827,7 @@ define(["dojo/_base/declare"], function (declare) {
} }
} }
console.log("cur: " + Article.getActive() + " next: " + next_id + " prev:" + prev_id); console.log("cur: " + current_id + " next: " + next_id + " prev:" + prev_id);
if (mode === "next") { if (mode === "next") {
if (next_id) { if (next_id) {
@ -851,14 +840,15 @@ define(["dojo/_base/declare"], function (declare) {
} }
} }
} else if (mode === "prev") { } else if (mode === "prev") {
if (prev_id || Article.getActive()) { if (prev_id || current_id) {
if (App.isCombinedMode()) { if (App.isCombinedMode()) {
const row = $("RROW-" + Article.getActive()); const row = $("RROW-" + current_id);
const ctr = $("headlines-frame"); const ctr = $("headlines-frame");
if (row && Math.round(row.offsetTop) < Math.round(ctr.scrollTop)) { if (row && Math.round(row.offsetTop) < Math.round(ctr.scrollTop)) {
Article.cdmMoveToId(Article.getActive(), {force: noscroll, event: event}); Article.setActive(current_id);
Article.cdmMoveToId(current_id, {force: noscroll, event: event});
} else if (prev_id) { } else if (prev_id) {
Article.setActive(prev_id); Article.setActive(prev_id);
Article.cdmMoveToId(prev_id, {force: noscroll, event: event, noscroll: noscroll}); Article.cdmMoveToId(prev_id, {force: noscroll, event: event, noscroll: noscroll});