Move remaining code from horde.js to tooltips.js.

diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index 5f7b081..874ecc9 100644 (file)
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -294,18 +294,6 @@ HTML;
     }
 
     /**
-     * Disable auto-loading of the horde.js script.
-     * Needs to auto-load by default for BC.
-     *
-     * @todo Remove for Horde 4
-     */
-    static public function disableAutoloadHordeJS()
-    {
-        $hsf = Horde_Script_Files::singleton();
-        $hsf->disableAutoloadHordeJS();
-    }
-
-    /**
      * Get a token for protecting a form.
      *
      * @param string $slug  Slug name.

diff --git a/framework/Core/lib/Horde/Script/Files.php b/framework/Core/lib/Horde/Script/Files.php
index c9c06cb..e56b638 100644 (file)
--- a/framework/Core/lib/Horde/Script/Files.php
+++ b/framework/Core/lib/Horde/Script/Files.php
@@ -59,13 +59,6 @@ class Horde_Script_Files
     protected $_ptversions = array('tables.js', 'stripe.js');
 
     /**
-     * Auto load horde.js?
-     *
-     * @var boolean
-     */
-    protected $_loadhordejs = true;
-
-    /**
      * Singleton.
      */
     static public function singleton()
@@ -225,10 +218,7 @@ class Horde_Script_Files
         }
 
         /* Add general UI js library. */
-        if ($this->_loadhordejs) {
-            $this->_add('prototype.js', 'horde', true);
-            $this->_add('horde.js', 'horde', true);
-        }
+        $this->_add('tooltips.js', 'horde', true);
 
         /* Add accesskeys.js if access keys are enabled. */
         if ($GLOBALS['prefs']->getValue('widget_accesskey')) {
@@ -256,15 +246,4 @@ class Horde_Script_Files
         return $jslist;
     }
 
-    /**
-     * Disable auto-loading of the horde.js script.
-     * Needs to auto-load by default for BC.
-     *
-     * @todo Remove for Horde 4
-     */
-    public function disableAutoloadHordeJS()
-    {
-        $this->_loadhordejs = false;
-    }
-
 }