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

Revert "scroll to end to show next feed or category" 

This reverts commit 86f32020f6.
This commit is contained in:
Andrew Dolgov 2014-07-25 09:20:00 +04:00
parent 1725817ac1
commit 6472dd11a2
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/viewfeed.js
View File

@ -8,7 +8,6 @@ var post_under_pointer = false;
var last_requested_article = false; var last_requested_article = false;
var catchup_id_batch = []; var catchup_id_batch = [];
var catchup_go_next = false;
var catchup_timeout_id = false; var catchup_timeout_id = false;
var cids_requested = []; var cids_requested = [];
@ -1329,8 +1328,6 @@ function headlines_scroll_handler(e) {
var ts = new Date().getTime(); var ts = new Date().getTime();
if (ts - _last_headlines_update < 100) return; if (ts - _last_headlines_update < 100) return;
var atend = true;
$$("#headlines-frame > div[id*=RROW][class*=Unread]").each( $$("#headlines-frame > div[id*=RROW][class*=Unread]").each(
function(child) { function(child) {
if (child.hasClassName("Unread") && $("headlines-frame").scrollTop > if (child.hasClassName("Unread") && $("headlines-frame").scrollTop >
@ -1342,18 +1339,10 @@ function headlines_scroll_handler(e) {
catchup_id_batch.push(id); catchup_id_batch.push(id);
//console.log("auto_catchup_batch: " + catchup_id_batch.toString()); //console.log("auto_catchup_batch: " + catchup_id_batch.toString());
} else {
atend = false;
} }
}); });
if (atend) {
if (getInitParam("on_catchup_show_next_feed") == "1") {
catchup_go_next = true;
}
}
if (catchup_id_batch.length > 0) { if (catchup_id_batch.length > 0) {
window.clearTimeout(catchup_timeout_id); window.clearTimeout(catchup_timeout_id);
@ -1399,12 +1388,6 @@ function catchupBatchedArticles() {
} }); } });
} }
if (catchup_go_next) {
catchup_go_next = false;
var is_cat = activeFeedIsCat();
var nuf = getNextUnreadFeed(getActiveFeedId(), is_cat);
if (nuf) viewfeed(nuf, '', is_cat);
}
} catch (e) { } catch (e) {
exception_error("catchupBatchedArticles", e); exception_error("catchupBatchedArticles", e);