disable infinite scrolling when Limit == 0 (closes #143)
This commit is contained in:
parent
e7e66b38d3
commit
4764c27ef8
|
@ -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_form = document.forms["main_toolbar_form"];
|
||||||
var toolbar_query = Form.serialize("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 = "";
|
toolbar_form.query.value = "";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
15
viewfeed.js
15
viewfeed.js
|
@ -1248,10 +1248,17 @@ function headlines_scroll_handler() {
|
||||||
|
|
||||||
var e = document.getElementById("headlinesInnerContainer");
|
var e = document.getElementById("headlinesInnerContainer");
|
||||||
|
|
||||||
if (e.scrollTop + e.offsetHeight > e.scrollHeight - 50) {
|
// don't do infinite scrolling when Limit == All
|
||||||
if (!_infscroll_disable) {
|
|
||||||
debug("more cowbell!");
|
var toolbar_form = document.forms["main_toolbar_form"];
|
||||||
viewNextFeedPage();
|
|
||||||
|
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();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue