summaryrefslogtreecommitdiff
path: root/js/FeedTree.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/FeedTree.js')
-rwxr-xr-xjs/FeedTree.js17
1 files changed, 15 insertions, 2 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);
}
},