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 ef5d72e5b96b88b71ec273cb6705df735a33a49f..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,7 +41,6 @@ function setActiveFeedId(id, is_cat) {
                }
 
                selectFeed(id, is_cat);
-
        } catch (e) {
                exception_error("setActiveFeedId", e);
        }
@@ -61,12 +60,12 @@ function updateFeedList() {
                }
 
                var store = new dojo.data.ItemFileWriteStore({
-         url: "backend.php?op=feeds"});
+         url: "backend.php?op=pref_feeds&method=getfeedtree&mode=2"});
 
                var treeModel = new fox.FeedStoreModel({
                        store: store,
                        query: {
-                               "type": "feed"
+                               "type": getInitParam('enable_feed_cats') == 1 ? "category" : "feed"
                        },
                        rootId: "root",
                        rootLabel: "Feeds",
@@ -105,6 +104,8 @@ function updateFeedList() {
                id: "feedTree",
                }, "feedTree");
 
+               _force_scheduled_update = true;
+
 /*             var menu = new dijit.Menu({id: 'feedMenu'});
 
                menu.addChild(new dijit.MenuItem({
@@ -165,6 +166,7 @@ function catchupAllFeeds() {
 }
 
 function viewCurrentFeed(method) {
+       console.log("viewCurrentFeed");
 
        if (getActiveFeedId() != undefined) {
                viewfeed(getActiveFeedId(), method, activeFeedIsCat());
@@ -281,6 +283,31 @@ function init() {
                        themeBeforeLayout();
                }
 
+               dojo.require("dijit.ColorPalette");
+               dojo.require("dijit.Dialog");
+               dojo.require("dijit.form.Button");
+               dojo.require("dijit.form.CheckBox");
+               dojo.require("dijit.form.DropDownButton");
+               dojo.require("dijit.form.FilteringSelect");
+               dojo.require("dijit.form.Form");
+               dojo.require("dijit.form.RadioButton");
+               dojo.require("dijit.form.Select");
+               dojo.require("dijit.form.SimpleTextarea");
+               dojo.require("dijit.form.TextBox");
+               dojo.require("dijit.form.ValidationTextBox");
+               dojo.require("dijit.InlineEditBox");
+               dojo.require("dijit.layout.AccordionContainer");
+               dojo.require("dijit.layout.BorderContainer");
+               dojo.require("dijit.layout.ContentPane");
+               dojo.require("dijit.layout.TabContainer");
+               dojo.require("dijit.Menu");
+               dojo.require("dijit.ProgressBar");
+               dojo.require("dijit.ProgressBar");
+               dojo.require("dijit.Toolbar");
+               dojo.require("dijit.Tree");
+               dojo.require("dijit.tree.dndSource");
+               dojo.require("dojo.data.ItemFileWriteStore");
+
                dojo.parser.parse();
 
                if (!genericSanityCheck())
@@ -528,6 +555,7 @@ function collapse_feedlist() {
 }
 
 function viewModeChanged() {
+       cache_clear();
        return viewCurrentFeed('');
 }
 
@@ -651,8 +679,7 @@ function hotkey_handler(e) {
                        }
 
                        if (keycode == 69) { // e
-                               var id = getActiveArticleId();
-                               emailArticle(id);
+                               emailArticle();
                        }
 
                        if ((keycode == 191 || keychar == '?') && shift_key) { // ?
@@ -801,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;
@@ -1003,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";