summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2009-11-13 15:36:14 -0800
committerBrion Vibber <brion@pobox.com>2009-11-13 15:36:14 -0800
commit5fab9bed48944d8328ef4d1b0c84bb1c67632c5d (patch)
tree690364c86ce00cbcbec67573e16506dd651da4be
parent50234be398a376c1f62499c33f31d9eea398a486 (diff)
parentc621a9db72978bbcb452d103949047c20ec2a745 (diff)
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
-rw-r--r--plugins/InfiniteScroll/infinitescroll.js10
1 files changed, 8 insertions, 2 deletions
diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js
index 09b2d4f72..0dafef6d5 100644
--- a/plugins/InfiniteScroll/infinitescroll.js
+++ b/plugins/InfiniteScroll/infinitescroll.js
@@ -2,7 +2,13 @@ jQuery(document).ready(function($){
$('notices_primary').infinitescroll({
debug: true,
infiniteScroll : false,
- nextSelector : "li.nav_next a",
+ 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>",
@@ -10,6 +16,6 @@ jQuery(document).ready(function($){
contentSelector : "#notices_primary ol.notices",
itemSelector : "#notices_primary ol.notices li"
},function(){
- NoticeAttachments();
+ SN.Init.Notices();
});
});