Merge branch 'master' into 1.0.x

[quix0rs-gnu-social.git] / plugins / InfiniteScroll / InfiniteScrollPlugin.php

diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
index 77ad83a51bb8ecfcf1dd1ca512d787eb73cd2f37..376d88abb0add3a770900598e5f78c3c67c47cbe 100644 (file)
--- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php
+++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
@@ -22,7 +22,7 @@
  * @category  Plugin
  * @package   StatusNet
  * @author    Craig Andrews <candrews@integralblue.com>
- * @copyright 2009 Craig Andrews http://candrews.integralblue.com
+ * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -40,8 +40,9 @@ class InfiniteScrollPlugin extends Plugin
 
     function onEndShowScripts($action)
     {
-        $action->script(common_path('plugins/InfiniteScroll/jquery.infinitescroll.js'));
-        $action->script(common_path('plugins/InfiniteScroll/infinitescroll.js'));
+        $action->inlineScript('var infinite_scroll_on_next_only = ' . ($this->on_next_only?'true':'false') . ';');
+        $action->script($this->path('jquery.infinitescroll.js'));
+        $action->script($this->path('infinitescroll.js'));
     }
 
     function onPluginVersion(&$versions)
@@ -51,6 +52,7 @@ class InfiniteScrollPlugin extends Plugin
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:InfiniteScroll',
                             'rawdescription' =>
+                            // TRANS: Plugin dscription.
                             _m('Infinite Scroll adds the following functionality to your StatusNet installation: When a user scrolls towards the bottom of the page, the next page of notices is automatically retrieved and appended. This means they never need to click "Next Page", which dramatically increases stickiness.'));
         return true;
     }