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

Merge branch '1.1.x' of gitorious.org:statusnet/mainline into 1.1.x

Browse Source
This commit is contained in:
Evan Prodromou 2012-10-17 10:10:12 -04:00
commit ea14cc7671
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/ClientSideShorten/ClientSideShortenPlugin.php
View File

@ -55,7 +55,7 @@ class ClientSideShortenPlugin extends Plugin
$user = common_current_user(); $user = common_current_user();
$action->inlineScript('var maxNoticeLength = ' . User_urlshortener_prefs::maxNoticeLength($user)); $action->inlineScript('var maxNoticeLength = ' . User_urlshortener_prefs::maxNoticeLength($user));
$action->inlineScript('var maxUrlLength = ' . User_urlshortener_prefs::maxUrlLength($user)); $action->inlineScript('var maxUrlLength = ' . User_urlshortener_prefs::maxUrlLength($user));
$action->script('plugins/ClientSideShorten/shorten.js'); $action->script($this->path('shorten.js'));
} }
} }

4
plugins/InfiniteScroll/InfiniteScrollPlugin.php
View File

@ -33,6 +33,9 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
class InfiniteScrollPlugin extends Plugin class InfiniteScrollPlugin extends Plugin
{ {
public $on_next_only = false;
function __construct() function __construct()
{ {
parent::__construct(); parent::__construct();
@ -41,6 +44,7 @@ class InfiniteScrollPlugin extends Plugin
function onEndShowScripts($action) function onEndShowScripts($action)
{ {
$action->inlineScript('var infinite_scroll_on_next_only = ' . ($this->on_next_only?'true':'false') . ';'); $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('jquery.infinitescroll.js'));
$action->script($this->path('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#showfavorites li.nav_next a,'+
'body#showgroup li.nav_next a,'+ 'body#showgroup li.nav_next a,'+
'body#favorited 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>", text : "<em>Loading the next set of posts...</em>",
donetext : "<em>Congratulations, you\'ve reached the end of the Internet.</em>", donetext : "<em>Congratulations, you\'ve reached the end of the Internet.</em>",
navSelector : "#pagination", navSelector : "#pagination",