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

rename Headlines.correctHeadlinesOffset() to scrollToArticleId() 

invoke it in Article.view() instead of all over the place
This commit is contained in:
Andrew Dolgov 2020-05-17 17:01:52 +03:00
parent 05a84ab778
commit 25c8467753
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/Article.js
View File

@ -139,7 +139,7 @@ define(["dojo/_base/declare"], function (declare) {
c.attr('content', article); c.attr('content', article);
PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED, c.domNode); PluginHost.run(PluginHost.HOOK_ARTICLE_RENDERED, c.domNode);
Headlines.correctHeadlinesOffset(Article.getActive()); //Headlines.correctHeadlinesOffset(Article.getActive());
try { try {
c.focus(); c.focus();
@ -198,6 +198,7 @@ define(["dojo/_base/declare"], function (declare) {
}, },
view: function (id, noexpand) { view: function (id, noexpand) {
this.setActive(id); this.setActive(id);
Headlines.scrollToArticleId(id);
if (!noexpand) { if (!noexpand) {
const hl = Headlines.objectById(id); const hl = Headlines.objectById(id);

4
js/Headlines.js
View File

@ -835,7 +835,6 @@ define(["dojo/_base/declare"], function (declare) {
Article.setActive(next_id); Article.setActive(next_id);
Article.cdmMoveToId(next_id, {event: event, noscroll: noscroll}); Article.cdmMoveToId(next_id, {event: event, noscroll: noscroll});
} else { } else {
Headlines.correctHeadlinesOffset(next_id);
Article.view(next_id, noexpand); Article.view(next_id, noexpand);
} }
} }
@ -855,7 +854,6 @@ define(["dojo/_base/declare"], function (declare) {
} }
} else if (prev_id) { } else if (prev_id) {
Headlines.correctHeadlinesOffset(prev_id);
Article.view(prev_id, noexpand); Article.view(prev_id, noexpand);
} }
} }
@ -1193,7 +1191,7 @@ define(["dojo/_base/declare"], function (declare) {
eval(elem.value); eval(elem.value);
elem.attr('value', 'false'); elem.attr('value', 'false');
}, },
correctHeadlinesOffset: function (id) { scrollToArticleId: function (id) {
const container = $("headlines-frame"); const container = $("headlines-frame");
const row = $("RROW-" + id); const row = $("RROW-" + id);