Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / Autocomplete / AutocompletePlugin.php

diff --git a/plugins/Autocomplete/AutocompletePlugin.php b/plugins/Autocomplete/AutocompletePlugin.php
index 39b933afd95cedd6bba1696fb7b9138e4bedd90d..0d3fdfc91dceab86f73c52ff39bddd96aef8021a 100644 (file)
--- a/plugins/Autocomplete/AutocompletePlugin.php
+++ b/plugins/Autocomplete/AutocompletePlugin.php
@@ -39,43 +39,23 @@ class AutocompletePlugin extends Plugin
         parent::__construct();
     }
 
-    function onAutoload($cls)
-    {
-        switch ($cls)
-        {
-         case 'AutocompleteAction':
-            require_once(INSTALLDIR.'/plugins/Autocomplete/autocomplete.php');
-            return false;
-        }
-    }
-
-    function onEndShowScripts($action){
+    function onEndShowScripts(Action $action){
         if (common_logged_in()) {
             $action->element('span', array('id' => 'autocomplete-api',
                                            'data-url' => common_local_url('autocomplete')));
-            $action->script($this->path('jquery-autocomplete/jquery.autocomplete.pack.js'));
-            $action->script($this->path('Autocomplete.js'));
+            $action->script($this->path('js/autocomplete.go.js'));
         }
     }
 
-    function onEndShowStatusNetStyles($action)
+    function onRouterInitialized(URLMapper $m)
     {
-        if (common_logged_in()) {
-            $action->cssLink($this->path('jquery-autocomplete/jquery.autocomplete.css'));
-        }
-    }
-
-    function onRouterInitialized($m)
-    {
-        if (common_logged_in()) {
-            $m->connect('main/autocomplete/suggest', array('action'=>'autocomplete'));
-        }
+        $m->connect('main/autocomplete/suggest', array('action'=>'autocomplete'));
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Autocomplete',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:Autocomplete',
                             'rawdescription' =>