GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge commit 'refs/merge-requests/182' of gitorious.org:statusnet/mainline into 1.1.x

This commit is contained in:
Jean Baptiste Favre 2012-09-19 09:58:14 +02:00
parent c11bc8a9ba a7507e3685
commit ae3eaee6cd
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/InfiniteScroll/InfiniteScrollPlugin.php
View File

@ -44,6 +44,7 @@ class InfiniteScrollPlugin extends Plugin
function onEndShowScripts($action)
{
$action->inlineScript('var infinite_scroll_on_next_only = ' . ($this->on_next_only?'true':'false') . ';');
$action->inlineScript('var ajax_loader_url = "' . ($this->path('ajax-loader.gif')) . '";');
$action->script($this->path('jquery.infinitescroll.js'));
$action->script($this->path('infinitescroll.js'));
}

2
plugins/InfiniteScroll/infinitescroll.js
View File

@ -9,7 +9,7 @@ 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",