add af_tumblr_1280

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

diff --git a/js/feedlist.js b/js/feedlist.js
index d3418176b00fc883d3cbee5968094c51fbf41e91..7c2e08052d41888afa630db048d5d36fc46f5a9d 100644 (file)
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -35,10 +35,7 @@ function loadMoreHeadlines() {
                } else if (_search_query) {
                        offset = num_all;
                } else if (view_mode == "adaptive") {
-                       if (num_unread > 0)
-                               offset = unread_in_buffer;
-                       else
-                               offset = num_all;
+                       offset = num_unread > 0 ? unread_in_buffer : num_all;
                } else {
                        offset = num_all;
                }
@@ -53,7 +50,7 @@ function loadMoreHeadlines() {
 }
 
 
-function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
+function viewfeed(feed, method, is_cat, offset, background, infscroll_req, can_wait) {
        try {
                if (is_cat == undefined)
                        is_cat = false;
@@ -95,7 +92,7 @@ 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) {
@@ -133,21 +130,24 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
 
                console.log(query);
 
-               if (_viewfeed_timeout) {
+               if (can_wait && _viewfeed_timeout) {
                        setFeedExpandoIcon(getActiveFeedId(), activeFeedIsCat(), 'images/blank_icon.gif');
                        clearTimeout(_viewfeed_timeout);
                }
+
                setActiveFeedId(feed, is_cat);
 
-               _viewfeed_timeout = setTimeout(function()) {
-               new Ajax.Request("backend.php", {
+               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]);
                                } });
-               }, 250); // 250ms delay
+               }, timeout_ms); // Wait 250ms
 
        } catch (e) {
                exception_error("viewfeed", e);