diff options
Diffstat (limited to 'js')
| -rwxr-xr-x | js/FeedTree.js | 17 | ||||
| -rwxr-xr-x | js/Headlines.js | 7 |
2 files changed, 20 insertions, 4 deletions
diff --git a/js/FeedTree.js b/js/FeedTree.js index 6b6189a4a..b8e50872a 100755 --- a/js/FeedTree.js +++ b/js/FeedTree.js @@ -110,7 +110,7 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"], menu.addChild(new dijit.MenuItem({ label: __("Mark all feeds as read"), onClick: function() { - Feeds.catchupAllFeeds(); + Feeds.catchupAll(); }})); menu.bindDomNode(tnode.domNode); @@ -270,8 +270,21 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"], this.focusNode(treeNode); // focus headlines to route key events there - setTimeout(function() { + setTimeout(() => { $("headlines-frame").focus(); + + if (treeNode) { + const node = treeNode.rowNode; + const tree = this.domNode; + + if (node && tree) { + // scroll tree to selection if needed + if (node.offsetTop < tree.scrollTop || node.offsetTop > tree.scrollTop + tree.clientHeight) { + $("feedTree").scrollTop = node.offsetTop; + } + } + } + }, 0); } }, diff --git a/js/Headlines.js b/js/Headlines.js index 6e1901fdc..e83a5fac7 100755 --- a/js/Headlines.js +++ b/js/Headlines.js @@ -442,7 +442,7 @@ define(["dojo/_base/declare"], function (declare) { <a class="title" title="${hl.title}" target="_blank" rel="noopener noreferrer" href="${hl.link}"> ${hl.title}</a> <span class="author">${hl.author}</span> - <span class="HLLCTR-${hl.id}">${hl.labels}</span> + ${hl.labels} ${hl.cdm_excerpt ? hl.cdm_excerpt : ""} </span> @@ -502,7 +502,7 @@ define(["dojo/_base/declare"], function (declare) { <span data-article-id="${hl.id}" class="hl-content hlMenuAttach"> <a class="title" href="${hl.link}">${hl.title} <span class="preview">${hl.content_preview}</span></a> <span class="author">${hl.author}</span> - <span class="HLLCTR-${hl.id}">${hl.labels}</span> + ${hl.labels} </span> </div> <span class="feed"> @@ -561,6 +561,9 @@ define(["dojo/_base/declare"], function (declare) { $("headlines-frame").addClassName(App.isCombinedMode() ? "cdm" : "normal"); + $("headlines-frame").setAttribute("is-vfeed", + reply['headlines']['is_vfeed'] ? 1 : 0); + Article.setActive(0); try { |