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

do some tweaks to prevent potential self-reading

This commit is contained in:
Andrew Dolgov 2013-03-25 14:01:33 +04:00
parent 9515f1cc0f
commit 62b1f587ab
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
js/viewfeed.js
View File

@ -205,7 +205,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
_infscroll_request_sent = 0; _infscroll_request_sent = 0;
headlines_scroll_handler($("headlines-frame")); unpackVisibleHeadlines();
notify(""); notify("");
@ -315,7 +315,7 @@ function article_callback2(transport, id) {
var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length var unread_in_buffer = $$("#headlines-frame > div[id*=RROW][class*=Unread]").length
request_counters(unread_in_buffer == 0); request_counters(unread_in_buffer == 0);
headlines_scroll_handler($("headlines-frame")); //headlines_scroll_handler($("headlines-frame"));
/* try { /* try {
if (!_infscroll_disable && if (!_infscroll_disable &&
@ -397,7 +397,7 @@ function view(id) {
console.warn(e); console.warn(e);
} */ } */
headlines_scroll_handler($("headlines-frame")); //headlines_scroll_handler($("headlines-frame"));
return; return;
} }
@ -1174,9 +1174,8 @@ function postMouseOut(id) {
post_under_pointer = false; post_under_pointer = false;
} }
function headlines_scroll_handler(e) { function unpackVisibleHeadlines() {
try { try {
var hsp = $("headlines-spacer");
$$("#headlines-frame > div[id*=RROW]").each( $$("#headlines-frame > div[id*=RROW]").each(
function(child) { function(child) {
@ -1195,6 +1194,17 @@ function headlines_scroll_handler(e) {
); );
} catch (e) {
exception_error("unpackVisibleHeadlines", e);
}
}
function headlines_scroll_handler(e) {
try {
var hsp = $("headlines-spacer");
unpackVisibleHeadlines();
if (!_infscroll_disable) { if (!_infscroll_disable) {
if ((hsp && e.scrollTop + e.offsetHeight >= hsp.offsetTop - hsp.offsetHeight) || if ((hsp && e.scrollTop + e.offsetHeight >= hsp.offsetTop - hsp.offsetHeight) ||
(e.scrollHeight != 0 && (e.scrollHeight != 0 &&