Merge branch '0.9-release'

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

diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js
index b80bd4ec5e30c1bb5b8a3f925d54eed09080777c..0c8edce2b09a9035f720925276621e0677fc2f4a 100644 (file)
--- a/plugins/InfiniteScroll/infinitescroll.js
+++ b/plugins/InfiniteScroll/infinitescroll.js
@@ -1,12 +1,21 @@
 jQuery(document).ready(function($){
   $('notices_primary').infinitescroll({
-    nextSelector    : "li.nav_next a",
+    debug: false,
+    infiniteScroll  : false,
+    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      : $('address .url')[0].href+'plugins/InfiniteScroll/ajax-loader.gif',
     text            : "<em>Loading the next set of posts...</em>",
     donetext        : "<em>Congratulations, you\'ve reached the end of the Internet.</em>",
-    navSelector     : "div.pagination",
-    contentSelector : "#notices_primary",
-    itemSelector    : "ol.notices"
+    navSelector     : ".pagination",
+    contentSelector : "#notices_primary ol.notices",
+    itemSelector    : "#notices_primary ol.notices li"
+    },function(){
+        SN.Init.Notices();
     });
 });
-