diff options
author | Heiko Adams <[email protected]> | 2015-11-30 10:29:44 +0100 |
---|---|---|
committer | Heiko Adams <[email protected]> | 2015-11-30 10:29:44 +0100 |
commit | 05761788b7b5a8a7e6c14333669acd0793886223 (patch) | |
tree | 464ccc3d98900e5dcf1a437662056161fa1280a4 /js/feedlist.js | |
parent | 635ecdb9fa039adb8a0e8ead045bfda023e72bc4 (diff) | |
parent | 6f5d9c6889b6376527d7598857ac8816cf7980ab (diff) |
Merge remote-tracking branch 'origin/master' into german-translation
Diffstat (limited to 'js/feedlist.js')
-rw-r--r-- | js/feedlist.js | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/js/feedlist.js b/js/feedlist.js index 7a5996a87..d14d3e5ca 100644 --- a/js/feedlist.js +++ b/js/feedlist.js @@ -35,7 +35,8 @@ function loadMoreHeadlines() { offset = unread_in_buffer; } else if (_search_query) { offset = num_all; - } else if (view_mode == "adaptive") { + } 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; @@ -59,6 +60,7 @@ function viewfeed(params) { 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; @@ -102,6 +104,8 @@ function viewfeed(params) { var query = "?op=feeds&method=view&feed=" + param_escape(feed) + "&" + toolbar_query; + if (method) query += "&m=" + param_escape(method); + if (offset > 0) { if (current_first_id) { query = query + "&fid=" + param_escape(current_first_id); @@ -123,7 +127,7 @@ function viewfeed(params) { query = query + "&vgrlf=" + param_escape(vgroup_last_feed); } } else { - if (!is_cat && feed == getActiveFeedId()) { + if (!is_cat && feed == getActiveFeedId() && !params.method) { query = query + "&m=ForceUpdate"; } } |