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

diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
index d919cd01eb9286981eeb475f7c8a7bf7795cc0fb..cec1a5352473f3cb0679e355ff3c55033aa2cab0 100644 (file)
--- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php
+++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
@@ -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'));
     }

diff --git a/plugins/InfiniteScroll/infinitescroll.js b/plugins/InfiniteScroll/infinitescroll.js
index f28c90a808fbc20c3cdf4ee5a101fd2f0a7feb02..6fcf098dfe6e169aa99e6a2eb5261c723901311d 100644 (file)
--- a/plugins/InfiniteScroll/infinitescroll.js
+++ b/plugins/InfiniteScroll/infinitescroll.js
@@ -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",