diff options
| author | Andrew Dolgov <[email protected]> | 2012-10-10 16:30:26 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-10-10 16:30:26 +0400 |
| commit | c67cd7ab9d7b7638b465240bd667b90437983ec8 (patch) | |
| tree | 6dc135d0883526ba0b495664aadd799e231f4f83 /js | |
| parent | 7704bdc0068b90f6dd86691dc377b21e418f6768 (diff) | |
fix infinite scrolling for search results
Diffstat (limited to 'js')
| -rw-r--r-- | js/feedlist.js | 8 | ||||
| -rw-r--r-- | js/viewfeed.js | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/js/feedlist.js b/js/feedlist.js index e838562a5..b737ba84a 100644 --- a/js/feedlist.js +++ b/js/feedlist.js @@ -33,6 +33,8 @@ function loadMoreHeadlines() { offset = num_all; } else if (view_mode == "unread") { offset = unread_in_buffer; + } else if (_search_query) { + offset = num_all; } else if (view_mode == "adaptive") { if (num_unread > 0) offset = unread_in_buffer; @@ -42,6 +44,8 @@ function loadMoreHeadlines() { offset = num_all; } + console.log("offset: " + offset); + viewfeed(getActiveFeedId(), '', activeFeedIsCat(), offset, false, true); } catch (e) { @@ -71,6 +75,8 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) { } else { cached_headlines = cache_get("feed:" + feed + ":" + is_cat); + if (_search_query) _search_query = false; + // switching to a different feed, we might as well catchup stuff visible // in headlines buffer (if any) // disabled for now because this behavior is considered confusing -fox @@ -149,7 +155,7 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) { if (_search_query) { force_nocache = true; query = query + "&" + _search_query; - _search_query = false; + //_search_query = false; } if (offset != 0) { diff --git a/js/viewfeed.js b/js/viewfeed.js index 2419988ff..cb0a75960 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -130,6 +130,9 @@ function headlines_callback2(transport, offset, background, infscroll_req) { console.log("added " + num_added + " headlines"); + if (num_added == 0) + _infscroll_disable = true; + console.log("restore selected ids: " + ids); for (var i = 0; i < ids.length; i++) { |