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

offline: disable infscroll when no new headlines are available; misc fixes

This commit is contained in:
Andrew Dolgov 2009-02-04 14:47:09 +03:00
parent 10003c4c2e
commit 0e923da4bd
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
feedlist.js
View File

@ -92,10 +92,10 @@ function viewNextFeedPage() {
try { try {
//if (!getActiveFeedId()) return; //if (!getActiveFeedId()) return;
debug("viewNextFeedPage: calling viewfeed(), p: " + _feed_cur_page+1); debug("viewNextFeedPage: calling viewfeed(), p: " + parseInt(_feed_cur_page+1));
viewfeed(getActiveFeedId(), undefined, activeFeedIsCat(), undefined, viewfeed(getActiveFeedId(), undefined, activeFeedIsCat(), undefined,
undefined, _feed_cur_page+1); undefined, parseInt(_feed_cur_page+1));
} catch (e) { } catch (e) {
exception_error("viewNextFeedPage", e); exception_error("viewNextFeedPage", e);

21
offline.js
View File

@ -69,6 +69,22 @@ function viewfeed_offline(feed_id, subop, is_cat, subop_param, skip_history, off
if (!offset) offset = 0; if (!offset) offset = 0;
if (offset > 0) {
_feed_cur_page = parseInt(offset);
if (_infscroll_request_sent) {
return;
}
} else {
_feed_cur_page = 0;
_infscroll_disable = 0;
}
if (getActiveFeedId() != feed_id) {
_feed_cur_page = 0;
active_post_id = 0;
_infscroll_disable = 0;
}
loading_set_progress(100); loading_set_progress(100);
clean_feed_selections(); clean_feed_selections();
@ -262,6 +278,10 @@ function viewfeed_offline(feed_id, subop, is_cat, subop_param, skip_history, off
line_num++; line_num++;
} }
if (line_num - offset*30 < 30) {
_infscroll_disable = 1;
}
rs.close(); rs.close();
if (offset == 0) { if (offset == 0) {
@ -286,6 +306,7 @@ function viewfeed_offline(feed_id, subop, is_cat, subop_param, skip_history, off
remove_splash(); remove_splash();
_infscroll_request_sent = 0;
} catch (e) { } catch (e) {
exception_error("viewfeed_offline", e); exception_error("viewfeed_offline", e);