X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FInfiniteScroll%2Finfinitescroll.js;h=6fcf098dfe6e169aa99e6a2eb5261c723901311d;hb=d7c40e77b2001678f5836e22ba3369b958a8352c;hp=82254613e7107967e7bc9294b9b9f038018475a0;hpb=acfa086d21c9a2624cb27182ff4011ec57ac2680;p=quix0rs-gnu-social.git

diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js
index 82254613e7..6fcf098dfe 100644
--- a/plugins/InfiniteScroll/infinitescroll.js
+++ b/plugins/InfiniteScroll/infinitescroll.js
@@ -1,7 +1,7 @@
 jQuery(document).ready(function($){
   $('notices_primary').infinitescroll({
-    debug: true,
-    infiniteScroll  : false,
+    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,'+
@@ -9,15 +9,19 @@ jQuery(document).ready(function($){
                       'body#showfavorites li.nav_next a,'+
                       'body#showgroup li.nav_next a,'+
                       'body#favorited li.nav_next a',
-    loadingImg      : $('address .url')[0].href+'plugins/InfiniteScroll/ajax-loader.gif',
+    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();
-        NoticeReply();
-        NoticeFavors();
+        // 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));
+        });
     });
 });