feedtree.selectFeed: focus headlines-frame after selection

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

diff --git a/js/viewfeed.js b/js/viewfeed.js
index abf56c185f5238b0919aa146d42311152cb0c954..3e2f9775186eac46d7c507e4f5d2eb79a23d57f2 100755 (executable)
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -13,6 +13,7 @@ var loaded_article_ids = [];
 var _last_headlines_update = 0;
 var _headlines_scroll_offset = 0;
 var current_first_id = 0;
+var last_search_query;
 
 var _catchup_request_sent = false;
 
@@ -38,6 +39,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
 
                is_cat = reply['headlines']['is_cat'];
                feed_id = reply['headlines']['id'];
+               last_search_query = reply['headlines']['search_query'];
 
                if (background) {
                        var content = reply['headlines']['content'];
@@ -1479,7 +1481,7 @@ function show_labels_in_headlines(transport) {
        }
 }
 
-function cdmClicked(event, id) {
+function cdmClicked(event, id, in_body) {
        //var shift_key = event.shiftKey;
 
        if (!event.ctrlKey && !event.metaKey) {
@@ -1521,7 +1523,7 @@ function cdmClicked(event, id) {
                        return !event.shiftKey;
                }
 
-       } else if (event.target.parents(".cdmHeader").length > 0) {
+       } else if (!in_body) {
 
                toggleSelected(id, true);
 
@@ -1535,6 +1537,8 @@ function cdmClicked(event, id) {
                toggleUnread(id, 0, false);
 
                openArticleInNewWindow(id);
+       } else {
+               return true;
        }
 
        var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length