add hotkey for toggling VFEED_GROUP_BY_FEED preference

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

diff --git a/js/tt-rss.js b/js/tt-rss.js
index f2a65b5399e1db21d3c2aea56343fd7aabe0b14b..108b65a7fec0a4a1886c9dc0064d711205a2af7c 100644 (file)
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -79,7 +79,7 @@ function updateFeedList() {
                        var id = String(item.id);
                        var is_cat = id.match("^CAT:");
                        var feed = id.substr(id.indexOf(":")+1);
-                       viewfeed(feed, '', is_cat);
+                       viewfeed({feed: feed, is_cat: is_cat});
                        return false;
                },
                openOnClick: false,
@@ -103,7 +103,7 @@ function updateFeedList() {
                $("feeds-holder").appendChild(tree.domNode);
 
                var tmph = dojo.connect(tree, 'onLoad', function() {
-               dojo.disconnect(tmph);
+                       dojo.disconnect(tmph);
                        Element.hide("feedlistLoading");
 
                        feedlist_init();
@@ -147,10 +147,10 @@ function catchupAllFeeds() {
 }
 
 function viewCurrentFeed(method) {
-       console.log("viewCurrentFeed");
+       console.log("viewCurrentFeed: " + method);
 
        if (getActiveFeedId() != undefined) {
-               viewfeed(getActiveFeedId(), method, activeFeedIsCat());
+               viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat(), method: method});
        }
        return false; // block unneeded form submits
 }
@@ -273,13 +273,13 @@ function init() {
                                var rv = dijit.byId("feedTree").getNextFeed(
                                                getActiveFeedId(), activeFeedIsCat());
 
-                               if (rv) viewfeed(rv[0], '', rv[1], null, null, null, true);
+                               if (rv) viewfeed({feed: rv[0], is_cat: rv[1], can_wait: true})
                };
                hotkey_actions["prev_feed"] = function() {
                                var rv = dijit.byId("feedTree").getPreviousFeed(
                                                getActiveFeedId(), activeFeedIsCat());
 
-                               if (rv) viewfeed(rv[0], '', rv[1], null, null, null, true);
+                               if (rv) viewfeed({feed: rv[0], is_cat: rv[1], can_wait: true})
                };
                hotkey_actions["next_article"] = function() {
                                moveToPost('next');
@@ -343,12 +343,6 @@ function init() {
                                        editArticleTags(id);
                                };
                        }
-               hotkey_actions["dismiss_selected"] = function() {
-                               dismissSelectedArticles();
-               };
-               hotkey_actions["dismiss_read"] = function() {
-                               dismissReadArticles();
-               };
                hotkey_actions["open_in_new_window"] = function() {
                                if (getActiveArticleId()) {
                                        openArticleInNewWindow(getActiveArticleId());
@@ -375,8 +369,6 @@ function init() {
                                if (isCdmMode()) {
                                        if (!getInitParam("cdm_expanded")) {
                                                cdmCollapseArticle(false, getActiveArticleId());
-                                       } else {
-                                               dismissArticle(getActiveArticleId());
                                        }
                                } else {
                                        closeArticlePanel();
@@ -411,7 +403,7 @@ function init() {
                };
                hotkey_actions["feed_refresh"] = function() {
                                if (getActiveFeedId() != undefined) {
-                                       viewfeed(getActiveFeedId(), '', activeFeedIsCat());
+                                       viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat()});
                                        return;
                                }
                };
@@ -429,6 +421,11 @@ function init() {
                                alert("You can't debug this kind of feed.");
                        }
                };
+
+               hotkey_actions["feed_debug_viewfeed"] = function() {
+                       viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat(), viewfeed_debug: true});
+               };
+
                hotkey_actions["feed_edit"] = function() {
                                if (activeFeedIsCat())
                                        alert(__("You can't edit this kind of feed."));
@@ -444,6 +441,16 @@ function init() {
                hotkey_actions["feed_reverse"] = function() {
                                reverseHeadlineOrder();
                };
+               hotkey_actions["feed_toggle_vgroup"] = function() {
+                       var query_str = "?op=rpc&method=togglepref&key=VFEED_GROUP_BY_FEED";
+
+                       new Ajax.Request("backend.php", {
+                               parameters: query_str,
+                               onComplete: function(transport) {
+                                       viewCurrentFeed();
+                       } });
+
+               };
                hotkey_actions["catchup_all"] = function() {
                                catchupAllFeeds();
                };
@@ -454,16 +461,16 @@ function init() {
                                }
                };
                hotkey_actions["goto_all"] = function() {
-                               viewfeed(-4);
+                               viewfeed({feed: -4});
                };
                hotkey_actions["goto_fresh"] = function() {
-                               viewfeed(-3);
+                               viewfeed({feed: -3});
                };
                hotkey_actions["goto_marked"] = function() {
-                               viewfeed(-1);
+                               viewfeed({feed: -1});
                };
                hotkey_actions["goto_published"] = function() {
-                               viewfeed(-2);
+                               viewfeed({feed: -2});
                };
                hotkey_actions["goto_tagcloud"] = function() {
                                displayDlg(__("Tag cloud"), "printTagCloud");