blallo/tt-rss
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

Browse source
This commit is contained in:
Andrew Dolgov 2012-08-23 13:03:52 +04:00
commit 3bdc2b999b
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/feedlist.js
View file

@ -242,7 +242,7 @@ function request_counters() {
try { try {
if (getInitParam("bw_limit") == "1") return; //if (getInitParam("bw_limit") == "1") return;
var date = new Date(); var date = new Date();
var timestamp = Math.round(date.getTime() / 1000); var timestamp = Math.round(date.getTime() / 1000);

16
js/viewfeed.js
View file

@ -97,10 +97,11 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
} else { } else {
if (headlines_count > 0 && feed_id == getActiveFeedId() && is_cat == activeFeedIsCat()) { if (headlines_count > 0 && feed_id == getActiveFeedId() && is_cat == activeFeedIsCat()) {
console.log("adding some more headlines..."); console.log("adding some more headlines: " + headlines_count);
var c = dijit.byId("headlines-frame"); var c = dijit.byId("headlines-frame");
var ids = getSelectedArticleIds2(); var ids = getSelectedArticleIds2();
var num_added = 0;
$("headlines-tmp").innerHTML = reply['headlines']['content']; $("headlines-tmp").innerHTML = reply['headlines']['content'];
@ -113,6 +114,7 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
if ($$("#headlines-frame DIV[id="+row.id+"]").length == 0) { if ($$("#headlines-frame DIV[id="+row.id+"]").length == 0) {
row.style.display = 'none'; row.style.display = 'none';
c.domNode.appendChild(row); c.domNode.appendChild(row);
++num_added;
} else { } else {
row.parentNode.removeChild(row); row.parentNode.removeChild(row);
} }
@ -126,6 +128,8 @@ function headlines_callback2(transport, offset, background, infscroll_req) {
c.domNode.appendChild(hsp); c.domNode.appendChild(hsp);
} }
console.log("added " + num_added + " headlines");
console.log("restore selected ids: " + ids); console.log("restore selected ids: " + ids);
for (var i = 0; i < ids.length; i++) { for (var i = 0; i < ids.length; i++) {
@ -1159,20 +1163,24 @@ function catchupBatchedArticles() {
try { try {
if (catchup_id_batch.length > 0 && !_infscroll_request_sent) { if (catchup_id_batch.length > 0 && !_infscroll_request_sent) {
// make a copy of the array
var batch = catchup_id_batch.slice();
var query = "?op=rpc&method=catchupSelected" + var query = "?op=rpc&method=catchupSelected" +
"&cmode=0&ids=" + param_escape(catchup_id_batch.toString()); "&cmode=0&ids=" + param_escape(batch.toString());
console.log(query);
new Ajax.Request("backend.php", { new Ajax.Request("backend.php", {
parameters: query, parameters: query,
onComplete: function(transport) { onComplete: function(transport) {
handle_rpc_json(transport); handle_rpc_json(transport);
catchup_id_batch.each(function(id) { batch.each(function(id) {
var elem = $("RROW-" + id); var elem = $("RROW-" + id);
if (elem) elem.removeClassName("Unread"); if (elem) elem.removeClassName("Unread");
catchup_id_batch.remove(id);
}); });
catchup_id_batch = [];
} }); } });
} }