diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 1e75b37795b1a825f5069514907ee03d10dbaaca..84f2f01e8b880811ae3ca249f467aa016921258b 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1,4 +1,6 @@ $(document).ready(function() { + var scrolled = 0; + $('#main_stream').infinitescroll({ navSelector : ".pagination", // selector for the paged navigation (it will be hidden) @@ -12,19 +14,27 @@ $(document).ready(function() { loadingText: "", loadingImg: '/images/ajax-loader.gif' }, function() { - $("a.paginate") - .detach() - .appendTo("#main_stream") - .css("display", "block"); - Diaspora.widgets.timeago.updateTimeAgo(); + scrolled++; + + if(scrolled > 2) { + (scrolled === 3) && $(window).unbind('.infscr'); + + $("a.paginate") + .detach() + .appendTo("#main_stream") + .css("display", "block"); + + Diaspora.widgets.timeago.updateTimeAgo(); + } }); - $(window).unbind('.infscr'); + $("a.paginate").live("click", function() { $(this).css("display", "none"); $(document).trigger("retrieve.infscr"); - }); + }) + .css("display", "none"); });