diff options
author | Andrew Dolgov <[email protected]> | 2012-10-28 11:03:29 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2012-10-28 11:03:29 +0400 |
commit | 09c816cac4d1a083093ac12f7e0b68c578eb9669 (patch) | |
tree | 062bf9b98b4568a238711567191b3f61759a3c48 | |
parent | 9a0e28f4dab1c80425152b24a05f01b9d95a982b (diff) |
remove unexpanded CDM ajax loading
-rw-r--r-- | classes/feeds.php | 2 | ||||
-rw-r--r-- | js/viewfeed.js | 46 |
2 files changed, 1 insertions, 47 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 72abc41e2..fd98314a9 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -638,7 +638,7 @@ class Feeds extends Handler_Protected { $reply['content'] .= "</div>";
$reply['content'] .= "<span id=\"CWRAP-$id\">";
- $reply['content'] .= $expand_cdm ? $article_content : '';
+ $reply['content'] .= $article_content;
$reply['content'] .= "</span>";
/* $tmp_result = db_query($this->link, "SELECT always_display_enclosures FROM
diff --git a/js/viewfeed.js b/js/viewfeed.js index ff09c0a5a..c55b5ccd9 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -1333,52 +1333,6 @@ function cdmExpandArticle(id) { if (!Element.visible(elem)) { Element.show(elem); 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; |