remove unexpanded CDM ajax loading

diff --git a/classes/feeds.php b/classes/feeds.php
index 72abc41e2cdfa49a1fd2d1d14ea9dc293516f18e..fd98314a9c7a23291902191cfc77a09bd909dbe4 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -638,7 +638,7 @@ class Feeds extends Handler_Protected {
                                        $reply['content'] .= "</div>";\r
 \r
                                        $reply['content'] .= "<span id=\"CWRAP-$id\">";\r
-                                       $reply['content'] .= $expand_cdm ? $article_content : '';\r
+                                       $reply['content'] .= $article_content;\r
                                        $reply['content'] .= "</span>";\r
 \r
 /*                                     $tmp_result = db_query($this->link, "SELECT always_display_enclosures FROM\r

diff --git a/js/viewfeed.js b/js/viewfeed.js
index ff09c0a5ac4defa2c9b606ab363ddcf7529a85b2..c55b5ccd9ad8faa971473e3a07cc68fb12b7891e 100644 (file)
--- 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;