X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FInfiniteScroll%2Finfinitescroll.js;h=b00445ee34d797bb54614263eff1f5d2e8b01236;hb=642f7f850da2694c1b94269b27f059423317b560;hp=961c3209166be6fdd3f66484f3aef3c479801b85;hpb=8eb66467165e107d0c80c64f6c429fed1d1101d5;p=quix0rs-gnu-social.git

diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js
index 961c320916..b00445ee34 100644
--- a/plugins/InfiniteScroll/infinitescroll.js
+++ b/plugins/InfiniteScroll/infinitescroll.js
@@ -1,7 +1,9 @@
+
+// notices
 jQuery(document).ready(function($){
   $('notices_primary').infinitescroll({
     debug: false,
-    infiniteScroll  : 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,12 +11,12 @@ 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(){
         // Reply button and attachment magic need to be set up
         // for each new notice.
@@ -23,5 +25,137 @@ jQuery(document).ready(function($){
             SN.U.NoticeReplyTo($(this));
             SN.U.NoticeWithAttachment($(this));
         });
+
+        // moving the loaded notices out of their container
+		$('#infscr-loading').remove();	
+		var ids_to_append = Array(); var i=0;
+		$.each($('.infscr-pages').children('.notice'),function(){
+			
+			// remove dupes
+			if($('.threaded-notices > #' + $(this).attr('id')).length > 0) {
+				$(this).remove();
+				}
+			
+			// keep new unique notices
+			else {
+				ids_to_append[i] = $(this).attr('id');				
+				i++;
+				}
+			});
+		var loaded_html = $('.infscr-pages').html();
+		$('.infscr-pages').remove();
+
+		// no results
+		if(loaded_html == '') {	
+			}
+		// append
+		else {
+			$('#notices_primary ol.notices').append(loaded_html);
+			}
+        
     });
 });
+
+
+// users
+jQuery(document).ready(function($){
+  $('profile_list').infinitescroll({
+    debug: false,
+    infiniteScroll  : !infinite_scroll_on_next_only,
+    nextSelector    : 'body#subscribers li.nav_next a, body#subscriptions li.nav_next a',
+    loadingImg      : ajax_loader_url,
+    text            : "<em>Loading the next set of users...</em>",
+    donetext        : "<em>Congratulations, you\'ve reached the end of the Internet.</em>",
+    navSelector     : "#pagination",
+    contentSelector : "#content_inner ul.profile_list",
+    itemSelector    : "#content_inner ul.profile_list > li"
+    },function(){
+        // 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('.profile').each(function() {
+            SN.U.NoticeReplyTo($(this));
+            SN.U.NoticeWithAttachment($(this));
+        });
+
+        // moving the loaded notices out of their container
+		$('#infscr-loading').remove();	
+		var ids_to_append = Array(); var i=0;
+		$.each($('.infscr-pages').children('.profile'),function(){
+			
+			// remove dupes
+			if($('.profile_list > #' + $(this).attr('id')).length > 0) {
+				$(this).remove();
+				}
+			
+			// keep new unique notices
+			else {
+				ids_to_append[i] = $(this).attr('id');				
+				i++;
+				}
+			});
+		var loaded_html = $('.infscr-pages').html();
+		$('.infscr-pages').remove();
+
+		// no results
+		if(loaded_html == '') {	
+			}
+		// append
+		else {
+			$('#content_inner ul.profile_list').append(loaded_html);
+			}
+        
+    });
+});
+
+
+// user directory
+jQuery(document).ready(function($){
+  $('profile_list').infinitescroll({
+    debug: false,
+    infiniteScroll  : !infinite_scroll_on_next_only,
+    nextSelector    : 'body#userdirectory li.nav_next a',
+    loadingImg      : ajax_loader_url,
+    text            : "<em>Loading the next set of users...</em>",
+    donetext        : "<em>Congratulations, you\'ve reached the end of the Internet.</em>",
+    navSelector     : "#pagination",
+    contentSelector : "#profile_directory table.profile_list tbody",
+    itemSelector    : "#profile_directory table.profile_list tbody tr"
+    },function(){
+        // 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('.profile').each(function() {
+            SN.U.NoticeReplyTo($(this));
+            SN.U.NoticeWithAttachment($(this));
+        });
+
+        // moving the loaded notices out of their container
+		$('#infscr-loading').remove();	
+		var ids_to_append = Array(); var i=0;
+		$.each($('.infscr-pages').children('.profile'),function(){
+			
+			// remove dupes
+			if($('.profile_list > #' + $(this).attr('id')).length > 0) {
+				$(this).remove();
+				}
+			
+			// keep new unique notices
+			else {
+				ids_to_append[i] = $(this).attr('id');				
+				i++;
+				}
+			});
+		var loaded_html = $('.infscr-pages').html();
+		$('.infscr-pages').remove();
+
+		// no results
+		if(loaded_html == '') {	
+			}
+		// append
+		else {
+			$('#profile_directory table.profile_list tbody').append(loaded_html);
+			}
+        
+    });
+});
\ No newline at end of file