Merge branch '0.8.x' of git://gitorious.org/~brion/statusnet/brion-fixes into 0.8.x

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

diff --git a/plugins/InfiniteScroll/InfiniteScrollPlugin.php b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
index 7e942550ae29b5fe0263a032bfad6b78358333cf..5928c007fe1a3991f8fa64290bace4c496329c2b 100644 (file)
--- a/plugins/InfiniteScroll/InfiniteScrollPlugin.php
+++ b/plugins/InfiniteScroll/InfiniteScrollPlugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Plugin to enable Infinite Scrolling
  *
@@ -20,14 +20,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Plugin
- * @package   Laconica
+ * @package   StatusNet
  * @author    Craig Andrews <candrews@integralblue.com>
  * @copyright 2009 Craig Andrews http://candrews.integralblue.com
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -40,23 +40,7 @@ class InfiniteScrollPlugin extends Plugin
 
     function onEndShowScripts($action)
     {
-        $action->script('plugins/InfiniteScroll/jquery.infinitescroll.min.js');
-        $loading_image = common_path('plugins/InfiniteScroll/ajax-loader.gif');
-        $js_string = <<<EOT
-<script type="text/javascript">
-jQuery(document).ready(function($){
-  $('notices_primary').infinitescroll({
-    nextSelector    : "li.nav_next a",
-    loadingImg      : "$loading_image",
-    text            : "<em>Loading the next set of posts...</em>",
-    donetext        : "<em>Congratulations, you\'ve reached the end of the Internet.</em>",
-    navSelector     : "div.pagination",
-    contentSelector : "#notices_primary",
-    itemSelector    : "ol.notices"
-    });
-});
-</script>
-EOT;
-        $action->raw($js_string);
+        $action->script('plugins/InfiniteScroll/jquery.infinitescroll.js');
+        $action->script('plugins/InfiniteScroll/infinitescroll.js');
     }
 }