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

only create headlines-spacer when cdm_auto_catchup is enabled (closes #380)

This commit is contained in:
Andrew Dolgov 2011-11-04 11:33:40 +04:00
parent 4515521c5f
commit ff4019f004
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
viewfeed.js
View File

@ -41,7 +41,13 @@ function headlines_callback2(transport, offset, background) {
feed_id = reply['headlines']['id']; feed_id = reply['headlines']['id'];
if (background) { 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; return;
} }
@ -74,10 +80,12 @@ function headlines_callback2(transport, offset, background) {
dijit.byId("headlines-toolbar").attr('content', dijit.byId("headlines-toolbar").attr('content',
reply['headlines']['toolbar']); 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(); initHeadlinesMenu();
@ -109,7 +117,9 @@ function headlines_callback2(transport, offset, background) {
fixHeadlinesOrder(getLoadedArticleIds()); fixHeadlinesOrder(getLoadedArticleIds());
c.domNode.appendChild(hsp); if (getInitParam("cdm_auto_catchup") == 1) {
c.domNode.appendChild(hsp);
}
console.log("restore selected ids: " + ids); console.log("restore selected ids: " + ids);
@ -1093,12 +1103,12 @@ function headlines_scroll_handler(e) {
if (hsp && (e.scrollTop + e.offsetHeight > hsp.offsetTop) || if (hsp && (e.scrollTop + e.offsetHeight > hsp.offsetTop) ||
e.scrollTop + e.offsetHeight > e.scrollHeight - 100) { e.scrollTop + e.offsetHeight > e.scrollHeight - 100) {
hsp.innerHTML = "<img src='images/indicator_tiny.gif'> " + if (hsp)
__("Loading, please wait..."); hsp.innerHTML = "<img src='images/indicator_tiny.gif'> " +
__("Loading, please wait...");
loadMoreHeadlines(); loadMoreHeadlines();
//viewNextFeedPage();
} }
} else { } else {
if (hsp) hsp.innerHTML = ""; if (hsp) hsp.innerHTML = "";