valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix infinite scrolling for search results

This commit is contained in:
Andrew Dolgov 2012-10-10 16:30:26 +04:00
parent 7704bdc006
commit c67cd7ab9d
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/feedlist.js
View File

@ -33,6 +33,8 @@ function loadMoreHeadlines() {
offset = num_all; offset = num_all;
} else if (view_mode == "unread") { } else if (view_mode == "unread") {
offset = unread_in_buffer; offset = unread_in_buffer;
} else if (_search_query) {
offset = num_all;
} else if (view_mode == "adaptive") { } else if (view_mode == "adaptive") {
if (num_unread > 0) if (num_unread > 0)
offset = unread_in_buffer; offset = unread_in_buffer;
@ -42,6 +44,8 @@ function loadMoreHeadlines() {
offset = num_all; offset = num_all;
} }
console.log("offset: " + offset);
viewfeed(getActiveFeedId(), '', activeFeedIsCat(), offset, false, true); viewfeed(getActiveFeedId(), '', activeFeedIsCat(), offset, false, true);
} catch (e) { } catch (e) {
@ -71,6 +75,8 @@ function viewfeed(feed, method, is_cat, offset, background, infscroll_req) {
} else { } else {
cached_headlines = cache_get("feed:" + feed + ":" + is_cat); 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 // switching to a different feed, we might as well catchup stuff visible
// in headlines buffer (if any) // in headlines buffer (if any)
// disabled for now because this behavior is considered confusing -fox // 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) { if (_search_query) {
force_nocache = true; force_nocache = true;
query = query + "&" + _search_query; query = query + "&" + _search_query;
_search_query = false; //_search_query = false;
} }
if (offset != 0) { if (offset != 0) {

3
js/viewfeed.js
View File

@ -130,6 +130,9 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
console.log("added " + num_added + " headlines"); console.log("added " + num_added + " headlines");
if (num_added == 0)
_infscroll_disable = true;
console.log("restore selected ids: " + ids); console.log("restore selected ids: " + ids);
for (var i = 0; i < ids.length; i++) { for (var i = 0; i < ids.length; i++) {