force refetch feed when clicking update/clicking on same feed in the tree

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

diff --git a/js/tt-rss.js b/js/tt-rss.js
index 1c6f121cfffbeb04ca362cdc6bc4b1551d42e301..f83ba377780ea7bb3f1d11c8b57b58e8d37c8498 100644 (file)
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -1,7 +1,7 @@
 var total_unread = 0;
 var global_unread = -1;
 var firsttime_update = true;
-var _active_feed_id = 0;
+var _active_feed_id = undefined;
 var _active_feed_is_cat = false;
 var hotkey_prefix = false;
 var hotkey_prefix_pressed = false;
@@ -41,10 +41,6 @@ function setActiveFeedId(id, is_cat) {
                }
 
                selectFeed(id, is_cat);
-
-               dijit.byId("include_children").attr("disabled", !(is_cat && id > 0));
-
-
        } catch (e) {
                exception_error("setActiveFeedId", e);
        }
@@ -170,6 +166,7 @@ function catchupAllFeeds() {
 }
 
 function viewCurrentFeed(method) {
+       console.log("viewCurrentFeed");
 
        if (getActiveFeedId() != undefined) {
                viewfeed(getActiveFeedId(), method, activeFeedIsCat());
@@ -354,13 +351,6 @@ function init_second_stage() {
                dijit.getEnclosingWidget(toolbar.order_by).attr('value',
                        getInitParam("default_view_order_by"));
 
-
-               if (getInitParam("enable_feed_cats") == 0)
-                       Element.hide(dijit.byId("include_children").domNode);
-
-               dijit.byId("include_children").attr("checked",
-                       getInitParam("default_include_children"));
-
                feeds_sort_by_unread = getInitParam("feeds_sort_by_unread") == 1;
 
                loading_set_progress(30);
@@ -565,6 +555,7 @@ function collapse_feedlist() {
 }
 
 function viewModeChanged() {
+       cache_clear();
        return viewCurrentFeed('');
 }
 
@@ -688,8 +679,7 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 69) { // e
-                               var id = getActiveArticleId();
-                               emailArticle(id);
+                               emailArticle();
                        }
 
                        if ((keycode == 191 || keychar == '?') && shift_key) { // ?
@@ -838,11 +828,21 @@ function hotkey_handler(e) {
                                return;
                        }
 
-                       if (keycode == 85) { // u
+                       if (keycode == 85 && !shift_key) { // u
                                selectArticles('unread');
                                return;
                        }
 
+                       if (keycode == 80) { // p
+                               selectArticles('published');
+                               return;
+                       }
+
+                       if (keycode == 85 && shift_key) { // u
+                               selectArticles('marked');
+                               return;
+                       }
+
                        if (keycode == 73) { // i
                                selectArticles('invert');
                                return;
@@ -1040,45 +1040,6 @@ function reverseHeadlineOrder() {
        }
 }
 
-function scheduleFeedUpdate(id, is_cat) {
-       try {
-               if (!id) {
-                       id = getActiveFeedId();
-                       is_cat = activeFeedIsCat();
-               }
-
-               if (!id) {
-                       alert(__("Please select some feed first."));
-                       return;
-               }
-
-               var query = "?op=rpc&method=scheduleFeedUpdate&id=" +
-                       param_escape(id) +
-                       "&is_cat=" + param_escape(is_cat);
-
-               console.log(query);
-
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               handle_rpc_json(transport);
-
-                               var reply = JSON.parse(transport.responseText);
-                               var message = reply['message'];
-
-                               if (message) {
-                                       notify_info(message);
-                                       return;
-                               }
-
-                       } });
-
-
-       } catch (e) {
-               exception_error("scheduleFeedUpdate", e);
-       }
-}
-
 function newVersionDlg() {
        try {
                var query = "backend.php?op=dlg&method=newVersion";