var has_storage = 'sessionStorage' in window && window['sessionStorage'] !== null;
-function headlines_callback2(transport, offset, background) {
+function headlines_callback2(transport, offset, background, infscroll_req) {
try {
handle_rpc_json(transport);
loading_set_progress(25);
- console.log("headlines_callback2 [offset=" + offset + "] B:" + background);
+ console.log("headlines_callback2 [offset=" + offset + "] B:" + background + " I:" + infscroll_req);
var is_cat = false;
var feed_id = false;
- var reply;
+ var reply = false;
try {
reply = JSON.parse(transport.responseText);
feed_id = reply['headlines']['id'];
if (background) {
- cache_headlines(feed_id, is_cat, reply['headlines']['toolbar'], reply['headlines']['content'] + "<div id='headlines-spacer'></div>");
+ var content = reply['headlines']['content'];
+
+ if (getInitParam("cdm_auto_catchup") == 1) {
+ content = content + "<div id='headlines-spacer'></div>";
+ }
+
+ cache_headlines(feed_id, is_cat, reply['headlines']['toolbar'], content);
return;
}
setActiveFeedId(feed_id, is_cat);
try {
- if (offset == 0) {
+ if (offset == 0 && infscroll_req == false) {
$("headlines-frame").scrollTop = 0;
}
} catch (e) { };
var counters = reply['counters'];
var articles = reply['articles'];
- var runtime_info = reply['runtime-info'];
+ //var runtime_info = reply['runtime-info'];
- if (offset == 0) {
+ if (offset == 0 && infscroll_req == false) {
dijit.byId("headlines-frame").attr('content',
reply['headlines']['content']);
dijit.byId("headlines-toolbar").attr('content',
reply['headlines']['toolbar']);
- var hsp = $("headlines-spacer");
- if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
- dijit.byId('headlines-frame').domNode.appendChild(hsp);
+ if (getInitParam("cdm_auto_catchup") == 1) {
+ var hsp = $("headlines-spacer");
+ if (!hsp) hsp = new Element("DIV", {"id": "headlines-spacer"});
+ dijit.byId('headlines-frame').domNode.appendChild(hsp);
+ }
initHeadlinesMenu();
fixHeadlinesOrder(getLoadedArticleIds());
- c.domNode.appendChild(hsp);
+ if (getInitParam("cdm_auto_catchup") == 1) {
+ c.domNode.appendChild(hsp);
+ }
console.log("restore selected ids: " + ids);
function selectionRemoveLabel(id, ids) {
try {
- if (!ids) var ids = getSelectedArticleIds2();
+ if (!ids) ids = getSelectedArticleIds2();
if (ids.length == 0) {
alert(__("No articles are selected."));
return;
}
- for (i = 0; i < rows.length; i++) {
+ for (var i = 0; i < rows.length; i++) {
var row = $("RROW-" + rows[i]);
if (row) {
if (set_state == undefined) {
return;
}
- for (i = 0; i < rows.length; i++) {
+ for (var i = 0; i < rows.length; i++) {
toggleMark(rows[i], true, true);
}
return;
}
- for (i = 0; i < rows.length; i++) {
+ for (var i = 0; i < rows.length; i++) {
togglePub(rows[i], true, true);
}
}
selectArticles('all');
- selectionToggleUnread(false, 'viewCurrentFeed()', true)
+ selectionToggleUnread(false, 'viewCurrentFeed()', true);
selectArticles('none');
}
var fn = getFeedName(getActiveFeedId(), activeFeedIsCat());
var str;
- var op;
if (getActiveFeedId() != 0) {
str = __("Delete %d selected articles in %s?");
return;
}
- selectionToggleUnread(false, 'viewCurrentFeed()', true)
+ selectionToggleUnread(false, 'viewCurrentFeed()', true);
} catch (e) {
exception_error("catchupSelection", e);
if (hsp && (e.scrollTop + e.offsetHeight > hsp.offsetTop) ||
e.scrollTop + e.offsetHeight > e.scrollHeight - 100) {
- hsp.innerHTML = "<img src='images/indicator_tiny.gif'> " +
- __("Loading, please wait...");
+ if (hsp)
+ hsp.innerHTML = "<img src='images/indicator_tiny.gif'> " +
+ __("Loading, please wait...");
loadMoreHeadlines();
+ return;
- //viewNextFeedPage();
}
} else {
if (hsp) hsp.innerHTML = "";
if (catchup_id_batch.indexOf(id) == -1)
catchup_id_batch.push(id);
+
+ //console.log("auto_catchup_batch: " + catchup_id_batch.toString());
}
});
- if (catchup_id_batch.length > 0 && !_infscroll_request_sent) {
+ if (catchup_id_batch.length > 0) {
window.clearTimeout(catchup_timeout_id);
- catchup_timeout_id = window.setTimeout('catchupBatchedArticles()',
- 1000);
+
+ if (!_infscroll_request_sent) {
+ catchup_timeout_id = window.setTimeout('catchupBatchedArticles()',
+ 2000);
+ }
}
}
var reply = JSON.parse(transport.responseText);
reply.each(function(article) {
- $("CWRAP-" + article['id']).innerHTML = article['content']
+ $("CWRAP-" + article['id']).innerHTML = article['content'];
cids_requested.remove(article['id']);
});
}});
function cdmClicked(event, id) {
try {
- var shift_key = event.shiftKey;
+ //var shift_key = event.shiftKey;
hideAuxDlg();
viewfeed(rf[0], '', rf[1], 0, true);
}
}
- precache_idle_timeout_id = setTimeout("precache_headlines_idle()", 5000);
+ precache_idle_timeout_id = setTimeout("precache_headlines_idle()", 1000*30);
} catch (e) {
exception_error("precache_headlines_idle", e);