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

disable infinite scrolling when Limit == 0 (closes #143)

This commit is contained in:
Andrew Dolgov 2007-08-29 15:10:41 +01:00
parent e7e66b38d3
commit 4764c27ef8
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
feedlist.js
View File

@ -75,7 +75,7 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
var toolbar_form = document.forms["main_toolbar_form"];
var toolbar_query = Form.serialize("main_toolbar_form");
if (document.forms["main_toolbar_form"].query) {
if (toolbar_form.query) {
toolbar_form.query.value = "";
}

15
viewfeed.js
View File

@ -1248,10 +1248,17 @@ function headlines_scroll_handler() {
var e = document.getElementById("headlinesInnerContainer");
if (e.scrollTop + e.offsetHeight > e.scrollHeight - 50) {
if (!_infscroll_disable) {
debug("more cowbell!");
viewNextFeedPage();
// don't do infinite scrolling when Limit == All
var toolbar_form = document.forms["main_toolbar_form"];
var limit = toolbar_form.limit[toolbar_form.limit.selectedIndex];
if (limit.value != 0) {
if (e.scrollTop + e.offsetHeight > e.scrollHeight - 50) {
if (!_infscroll_disable) {
debug("more cowbell!");
viewNextFeedPage();
}
}
}