Show more links work with AJAX-retrieved HTML

[quix0rs-gnu-social.git] / plugins / InfiniteScroll / infinitescroll.js

diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js
index 09b2d4f72e40bdfc103905952894ad23e0f9b228..6fcf098dfe6e169aa99e6a2eb5261c723901311d 100644 (file)
--- a/plugins/InfiniteScroll/infinitescroll.js
+++ b/plugins/InfiniteScroll/infinitescroll.js
@@ -1,15 +1,27 @@
 jQuery(document).ready(function($){
   $('notices_primary').infinitescroll({
-    debug: true,
-    infiniteScroll  : false,
-    nextSelector    : "li.nav_next a",
-    loadingImg      : $('address .url')[0].href+'plugins/InfiniteScroll/ajax-loader.gif',
+    debug: false,
+    infiniteScroll  : !infinite_scroll_on_next_only,
+    nextSelector    : 'body#public li.nav_next a,'+
+                      'body#all li.nav_next a,'+
+                      'body#showstream li.nav_next a,'+
+                      'body#replies li.nav_next a,'+
+                      'body#showfavorites li.nav_next a,'+
+                      'body#showgroup li.nav_next a,'+
+                      'body#favorited li.nav_next a',
+    loadingImg      : ajax_loader_url,
     text            : "<em>Loading the next set of posts...</em>",
     donetext        : "<em>Congratulations, you\'ve reached the end of the Internet.</em>",
-    navSelector     : ".pagination",
+    navSelector     : "#pagination",
     contentSelector : "#notices_primary ol.notices",
-    itemSelector    : "#notices_primary ol.notices li"
+    itemSelector    : "#notices_primary ol.notices > li"
     },function(){
-        NoticeAttachments();
+        // Reply button and attachment magic need to be set up
+        // for each new notice.
+        // DO NOT run SN.Init.Notices() which will duplicate stuff.
+        $(this).find('.notice').each(function() {
+            SN.U.NoticeReplyTo($(this));
+            SN.U.NoticeWithAttachment($(this));
+        });
     });
 });