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

remove unexpanded CDM ajax loading

This commit is contained in:
Andrew Dolgov 2012-10-28 11:03:29 +04:00
parent 9a0e28f4da
commit 09c816cac4
2 changed files with 1 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/feeds.php
View File

@ -638,7 +638,7 @@ class Feeds extends Handler_Protected {
$reply['content'] .= "</div>"; $reply['content'] .= "</div>";
$reply['content'] .= "<span id=\"CWRAP-$id\">"; $reply['content'] .= "<span id=\"CWRAP-$id\">";
$reply['content'] .= $expand_cdm ? $article_content : ''; $reply['content'] .= $article_content;
$reply['content'] .= "</span>"; $reply['content'] .= "</span>";
/* $tmp_result = db_query($this->link, "SELECT always_display_enclosures FROM /* $tmp_result = db_query($this->link, "SELECT always_display_enclosures FROM

46
js/viewfeed.js
View File

@ -1333,52 +1333,6 @@ function cdmExpandArticle(id) {
if (!Element.visible(elem)) { if (!Element.visible(elem)) {
Element.show(elem); Element.show(elem);
Element.hide("CEXC-" + id); Element.hide("CEXC-" + id);
if ($("CWRAP-" + id).innerHTML == "") {
$("FUPDPIC-" + id).src = "images/indicator_tiny.gif";
$("CWRAP-" + id).innerHTML = "<div class=\"insensitive\">" +
__("Loading, please wait...") + "</div>";
var query = "?op=rpc&method=cdmGetArticle&id=" + param_escape(id);
var neighbor_ids = getRelativePostIds(id);
/* only request uncached articles */
var cids_to_request = [];
for (var i = 0; i < neighbor_ids.length; i++) {
if (cids_requested.indexOf(neighbor_ids[i]) == -1)
if ($("CWRAP-" + neighbor_ids[i]).innerHTML == "") {
cids_to_request.push(neighbor_ids[i]);
cids_requested.push(neighbor_ids[i]);
}
}
console.log("additional ids: " + cids_to_request.toString());
query = query + "&cids=" + cids_to_request.toString();
console.log(query);
new Ajax.Request("backend.php", {
parameters: query,
onComplete: function(transport) {
$("FUPDPIC-" + id).src = 'images/blank_icon.gif';
handle_rpc_json(transport);
var reply = JSON.parse(transport.responseText);
reply.each(function(article) {
$("CWRAP-" + article['id']).innerHTML = article['content'];
cids_requested.remove(article['id']);
});
}});
}
} }
var new_offset = $("RROW-" + id).offsetTop; var new_offset = $("RROW-" + id).offsetTop;