getfeedname: fix for non-numeric feeds (tags)

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

diff --git a/js/feedlist.js b/js/feedlist.js
index 84b561227578c82b6b62dafb782c61a6520331e7..c9ff121d78c06611cecfd885ed94241ed7f1a94c 100644 (file)
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -1,12 +1,14 @@
 var _infscroll_disable = 0;
 var _infscroll_request_sent = 0;
+
 var _search_query = false;
 var _viewfeed_last = 0;
+var _viewfeed_timeout = false;
 
 var counters_last_request = 0;
 
 function viewCategory(cat) {
-       viewfeed(cat, '', true);
+       viewfeed({feed: cat, is_cat: true});
        return false;
 }
 
@@ -33,33 +35,38 @@ function loadMoreHeadlines() {
                        offset = unread_in_buffer;
                } else if (_search_query) {
                        offset = num_all;
-               } else if (view_mode == "adaptive") {
-                       if (num_unread > 0)
-                               offset = unread_in_buffer;
-                       else
-                               offset = num_all;
+               } else if (view_mode == "adaptive" && !(getActiveFeedId() == -1 && !activeFeedIsCat())) {
+                       // ^ starred feed shows both unread & read articles in adaptive mode
+                       offset = num_unread > 0 ? unread_in_buffer : num_all;
                } else {
                        offset = num_all;
                }
 
                console.log("offset: " + offset);
 
-               viewfeed(getActiveFeedId(), '', activeFeedIsCat(), offset, false, true);
+               viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat(), offset: offset, infscroll_req: true});
 
        } catch (e) {
                exception_error("viewNextFeedPage", e);
        }
 }
 
-
-function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
+function viewfeed(params) {
        try {
+               var feed = params.feed;
+               var is_cat = params.is_cat;
+               var offset = params.offset;
+               var background = params.background;
+               var infscroll_req = params.infscroll_req;
+               var can_wait = params.can_wait;
+               var viewfeed_debug = params.viewfeed_debug;
+               var method = params.method;
+
                if (is_cat == undefined)
                        is_cat = false;
                else
                        is_cat = !!is_cat;
 
-               if (method == undefined) method = '';
                if (offset == undefined) offset = 0;
                if (background == undefined) background = false;
                if (infscroll_req == undefined) infscroll_req = false;
@@ -73,12 +80,12 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
                if (!background) {
                        _viewfeed_last = get_timestamp();
 
-                       if (getActiveFeedId() != feed || offset == 0) {
+                       if (getActiveFeedId() != feed || !infscroll_req) {
                                setActiveArticleId(0);
                                _infscroll_disable = 0;
                        }
 
-                       if (offset != 0 && !method) {
+                       if (infscroll_req) {
                                var timestamp = get_timestamp();
 
                                if (_infscroll_request_sent && _infscroll_request_sent + 30 > timestamp) {
@@ -94,11 +101,15 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
 
                var toolbar_query = Form.serialize("main_toolbar_form");
 
-               var query = "?op=feeds&method=view&feed=" + feed + "&" +
+               var query = "?op=feeds&method=view&feed=" + param_escape(feed) + "&" +
                        toolbar_query;
 
-               if (method) {
-                       query = query + "&m=" + param_escape(method);
+               if (method) query += "&m=" + param_escape(method);
+
+               if (offset > 0) {
+                       if (current_first_id) {
+                               query = query + "&fid=" + param_escape(current_first_id);
+                       }
                }
 
                if (!background) {
@@ -116,7 +127,7 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
                                        query = query + "&vgrlf=" + param_escape(vgroup_last_feed);
                                }
                        } else {
-                               if (!method && !is_cat && feed == getActiveFeedId()) {
+                               if (!is_cat && feed == getActiveFeedId() && !params.method) {
                                        query = query + "&m=ForceUpdate";
                                }
                        }
@@ -132,15 +143,28 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
 
                console.log(query);
 
+               if (can_wait && _viewfeed_timeout) {
+                       setFeedExpandoIcon(getActiveFeedId(), activeFeedIsCat(), 'images/blank_icon.gif');
+                       clearTimeout(_viewfeed_timeout);
+               }
+
                setActiveFeedId(feed, is_cat);
 
-               new Ajax.Request("backend.php", {
-                       parameters: query,
-                       onComplete: function(transport) {
-                               setFeedExpandoIcon(feed, is_cat, 'images/blank_icon.gif');
-                               headlines_callback2(transport, offset, background, infscroll_req);
-                               PluginHost.run(PluginHost.HOOK_FEED_LOADED, [feed, is_cat]);
-                       } });
+               if (viewfeed_debug) {
+                       window.open("backend.php" + query + "&debug=1&csrf_token=" + getInitParam("csrf_token"));
+               }
+
+               timeout_ms = can_wait ? 250 : 0;
+               _viewfeed_timeout = setTimeout(function() {
+
+                       new Ajax.Request("backend.php", {
+                               parameters: query,
+                               onComplete: function(transport) {
+                                       setFeedExpandoIcon(feed, is_cat, 'images/blank_icon.gif');
+                                       headlines_callback2(transport, offset, background, infscroll_req);
+                                       PluginHost.run(PluginHost.HOOK_FEED_LOADED, [feed, is_cat]);
+                               } });
+               }, timeout_ms); // Wait 250ms
 
        } catch (e) {
                exception_error("viewfeed", e);
@@ -157,9 +181,9 @@ function feedlist_init() {
                setTimeout("hotkey_prefix_timeout()", 5*1000);
 
                if (!getActiveFeedId()) {
-                       viewfeed(-3);
+                       viewfeed({feed: -3});
                } else {
-                       viewfeed(getActiveFeedId(), '', activeFeedIsCat());
+                       viewfeed({feed: getActiveFeedId(), is_cat: activeFeedIsCat()});
                }
 
                hideOrShowFeeds(getInitParam("hide_read_feeds") == 1);
@@ -297,6 +321,9 @@ function hideOrShowFeeds(hide) {
 }
 
 function getFeedName(feed, is_cat) {
+
+       if (isNaN(feed)) return feed; // it's a tag
+
        var tree = dijit.byId("feedTree");
 
        if (tree && tree.model)
@@ -453,7 +480,7 @@ function catchupFeed(feed, is_cat, mode) {
                                                var nuf = getNextUnreadFeed(feed, is_cat);
 
                                                if (nuf) {
-                                                       viewfeed(nuf, '', is_cat);
+                                                       viewfeed({feed: nuf, is_cat: is_cat});
                                                }
                                        } else {
                                                if (feed == getActiveFeedId() && is_cat == activeFeedIsCat()) {