Merge branch 'master' of git.fakecake.org:tt-rss into pdo-experimental

[tt-rss.git] / js / FeedTree.js

diff --git a/js/FeedTree.js b/js/FeedTree.js
index 336f2b5f04ba12b9acf80c3db7bd0ef12d0cfdc0..63fa308f02f64c4c70f80fa1de39aab98a597477 100644 (file)
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -302,7 +302,7 @@ require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"]
                                        }
                                }
                        } catch (e) {
-                               exception_error("expandParentNodes", e);
+                               exception_error(e);
                        }
                },
                findNodeParentsAndExpandThem: function(feed, is_cat, root, parents) {
@@ -341,7 +341,7 @@ require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"]
                                        }
                                }
                        } catch (e) {
-                               exception_error("findNodeParentsAndExpandThem", e);
+                               exception_error(e);
                        }
                },
                selectFeed: function(feed, is_cat) {
@@ -356,6 +356,12 @@ require(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"]
                                treeNode = treeNode[0];
                                if (!is_cat) this._expandNode(treeNode);
                                this.set("selectedNodes", [treeNode]);
+                               this.focusNode(treeNode);
+
+                               // focus headlines to route key events there
+                               setTimeout(function() {
+                                       $("headlines-frame").focus();
+                               }, 0);
                        }
                },
                setFeedIcon: function(feed, is_cat, src) {