From 182c46beaf2668496e320f22e4839d36d0b67516 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Fri, 24 Jan 2014 23:57:11 -0700 Subject: [PATCH] Providing full classname results in slightly faster loading --- framework/Core/lib/Horde.php | 2 +- framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter.php | 2 +- framework/Core/lib/Horde/Core/Ajax/Imple/SpellChecker.php | 2 +- framework/Core/lib/Horde/PageOutput.php | 2 +- gollem/manager.php | 2 +- hermes/lib/Ajax.php | 2 +- horde/lib/View/Topbar.php | 2 +- imp/lib/Ajax/Imple/PassphraseDialog.php | 2 +- imp/lib/Basic/Mailbox.php | 2 +- imp/lib/Basic/Message.php | 2 +- imp/lib/Dynamic/Compose/Common.php | 4 ++-- imp/lib/Dynamic/Mailbox.php | 2 +- kronolith/lib/Ajax.php | 2 +- nag/task.php | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-) diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php index a5ce9c86fb3..ce978913b15 100644 --- a/framework/Core/lib/Horde.php +++ b/framework/Core/lib/Horde.php @@ -1191,7 +1191,7 @@ static public function getCacheUrl($type, $params = array()) */ static public function popupJs($url, $options = array()) { - $GLOBALS['page_output']->addScriptPackage('Popup'); + $GLOBALS['page_output']->addScriptPackage('Horde_Core_Script_Package_Popup'); $params = new stdClass; diff --git a/framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter.php b/framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter.php index 25205df44e7..7dca1251928 100644 --- a/framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter.php +++ b/framework/Core/lib/Horde/Core/Ajax/Imple/AutoCompleter.php @@ -30,7 +30,7 @@ protected function _attach($init) if (!self::$_initAc) { $page_output->addScriptFile('autocomplete.js', 'horde'); $page_output->addScriptFile('liquidmetal.js', 'horde'); - $page_output->addScriptPackage('Keynavlist'); + $page_output->addScriptPackage('Horde_Core_Script_Package_Keynavlist'); $page_output->addInlineJsVars(array( 'HordeImple.AutoCompleter' => new stdClass diff --git a/framework/Core/lib/Horde/Core/Ajax/Imple/SpellChecker.php b/framework/Core/lib/Horde/Core/Ajax/Imple/SpellChecker.php index ff96c650330..8be11ffd00e 100644 --- a/framework/Core/lib/Horde/Core/Ajax/Imple/SpellChecker.php +++ b/framework/Core/lib/Horde/Core/Ajax/Imple/SpellChecker.php @@ -52,7 +52,7 @@ protected function _attach($init) if ($init) { $page_output->addScriptFile('spellchecker.js', 'horde'); - $page_output->addScriptPackage('Keynavlist'); + $page_output->addScriptPackage('Horde_Core_Script_Package_Keynavlist'); $page_output->addInlineJsVars(array( 'HordeImple.SpellChecker' => new stdClass diff --git a/framework/Core/lib/Horde/PageOutput.php b/framework/Core/lib/Horde/PageOutput.php index 283bf34bd9d..a14b8adabdc 100644 --- a/framework/Core/lib/Horde/PageOutput.php +++ b/framework/Core/lib/Horde/PageOutput.php @@ -725,7 +725,7 @@ public function header(array $opts = array()) $this->growler = true; $this->_addBasicScripts(); - $this->addScriptPackage('Popup'); + $this->addScriptPackage('Horde_Core_Script_Package_Popup'); break; case $registry::VIEW_MINIMAL: diff --git a/gollem/manager.php b/gollem/manager.php index c9a2a8a2f99..f2311f0a747 100644 --- a/gollem/manager.php +++ b/gollem/manager.php @@ -594,7 +594,7 @@ $template->itemcount = sprintf(ngettext(_("%d item"), _("%d items"), $total), $total); $page_output->addScriptFile('manager.js'); -$page_output->addScriptPackage('Dialog'); +$page_output->addScriptPackage('Horde_Core_Script_Package_Dialog'); $page_output->addInlineJsVars(array( 'var GollemVar' => array( 'actionUrl' => strval(Horde::url('manager.php')), diff --git a/hermes/lib/Ajax.php b/hermes/lib/Ajax.php index 5b857b1015b..0e68bcc3ce0 100644 --- a/hermes/lib/Ajax.php +++ b/hermes/lib/Ajax.php @@ -22,7 +22,7 @@ public function init() $page_output->addScriptFile('redbox.js', 'horde'); $page_output->addScriptFile('tooltips.js', 'horde'); - $page_output->addScriptPackage('Datejs'); + $page_output->addScriptPackage('Horde_Core_Script_Package_Datejs'); $page_output->addScriptFile('quickfinder.js', 'horde'); if ($GLOBALS['browser']->isBrowser('msie')) { $page_output->addScriptFile('excanvas/excanvas.min.js', 'horde'); diff --git a/horde/lib/View/Topbar.php b/horde/lib/View/Topbar.php index 27ea08c07f2..bf386ff6ada 100644 --- a/horde/lib/View/Topbar.php +++ b/horde/lib/View/Topbar.php @@ -83,7 +83,7 @@ public function __construct($config = array()) /* Sub bar. */ $this->date = strftime($prefs->getValue('date_format')); $pageOutput = $injector->getInstance('Horde_PageOutput'); - $pageOutput->addScriptPackage('Datejs'); + $pageOutput->addScriptPackage('Horde_Core_Script_Package_Datejs'); $pageOutput->addScriptFile('topbar.js', 'horde'); $pageOutput->addInlineJsVars(array('HordeTopbar.conf' => array( /* Need explicit URI here, since topbar may be running in diff --git a/imp/lib/Ajax/Imple/PassphraseDialog.php b/imp/lib/Ajax/Imple/PassphraseDialog.php index 2677e97330a..776e661c306 100644 --- a/imp/lib/Ajax/Imple/PassphraseDialog.php +++ b/imp/lib/Ajax/Imple/PassphraseDialog.php @@ -42,7 +42,7 @@ protected function _attach($init) global $page_output; if ($init) { - $page_output->addScriptPackage('Dialog'); + $page_output->addScriptPackage('Horde_Core_Script_Package_Dialog'); $page_output->addScriptFile('passphrase.js', 'imp'); } diff --git a/imp/lib/Basic/Mailbox.php b/imp/lib/Basic/Mailbox.php index 56f95d8419e..e70110628bf 100644 --- a/imp/lib/Basic/Mailbox.php +++ b/imp/lib/Basic/Mailbox.php @@ -400,7 +400,7 @@ protected function _init() $page_output->addScriptFile('hordecore.js', 'horde'); $page_output->addScriptFile('mailbox.js'); - $page_output->addScriptPackage('Dialog'); + $page_output->addScriptPackage('Horde_Core_Script_Package_Dialog'); $page_output->metaRefresh($prefs->getValue('refresh_time'), $refresh_url); diff --git a/imp/lib/Basic/Message.php b/imp/lib/Basic/Message.php index 7b850ca81f9..30fc64d9ceb 100644 --- a/imp/lib/Basic/Message.php +++ b/imp/lib/Basic/Message.php @@ -898,7 +898,7 @@ protected function _init() if (!empty($conf['tasklist']['use_notepad']) || !empty($conf['tasklist']['use_tasklist'])) { - $page_output->addScriptPackage('Dialog'); + $page_output->addScriptPackage('Horde_Core_Script_Package_Dialog'); } $page_output->noDnsPrefetch(); diff --git a/imp/lib/Dynamic/Compose/Common.php b/imp/lib/Dynamic/Compose/Common.php index 8f317d5ebc7..dc1d455ba21 100644 --- a/imp/lib/Dynamic/Compose/Common.php +++ b/imp/lib/Dynamic/Compose/Common.php @@ -38,7 +38,7 @@ public function compose(IMP_Dynamic_Base $base, array $args = array()) { global $injector, $page_output, $prefs; - $page_output->addScriptPackage('Keynavlist'); + $page_output->addScriptPackage('Horde_Core_Script_Package_Keynavlist'); $page_output->addScriptPackage('IMP_Script_Package_ComposeBase'); $page_output->addScriptFile('compose-dimp.js'); $page_output->addScriptFile('draghandler.js'); @@ -46,7 +46,7 @@ public function compose(IMP_Dynamic_Base $base, array $args = array()) if (!$prefs->isLocked('default_encrypt') && ($prefs->getValue('use_pgp') || $prefs->getValue('use_smime'))) { - $page_output->addScriptPackage('Dialog'); + $page_output->addScriptPackage('Horde_Core_Script_Package_Dialog'); $page_output->addScriptFile('passphrase.js'); } diff --git a/imp/lib/Dynamic/Mailbox.php b/imp/lib/Dynamic/Mailbox.php index ad4ff136062..2c01e2b568a 100644 --- a/imp/lib/Dynamic/Mailbox.php +++ b/imp/lib/Dynamic/Mailbox.php @@ -36,7 +36,7 @@ protected function _init() $page_output->addScriptFile('jstorage.js', 'horde'); $page_output->addScriptFile('slider2.js', 'horde'); $page_output->addScriptFile('toggle_quotes.js', 'horde'); - $page_output->addScriptPackage('Dialog'); + $page_output->addScriptPackage('Horde_Core_Script_Package_Dialog'); $page_output->addScriptPackage('IMP_Script_Package_Imp'); $imp_imap = $injector->getInstance('IMP_Factory_Imap')->create(); diff --git a/kronolith/lib/Ajax.php b/kronolith/lib/Ajax.php index 4a5161ec813..9eddb7e0d2a 100644 --- a/kronolith/lib/Ajax.php +++ b/kronolith/lib/Ajax.php @@ -24,7 +24,7 @@ public function init() $page_output->addScriptFile('redbox.js', 'horde'); $page_output->addScriptFile('tooltips.js', 'horde'); $page_output->addScriptFile('colorpicker.js', 'horde'); - $page_output->addScriptPackage('Datejs'); + $page_output->addScriptPackage('Horde_Core_Script_Package_Datejs'); $page_output->addScriptFile('kronolith.js'); Horde_Core_Ui_JsCalendar::init(array('short_weekdays' => true)); diff --git a/nag/task.php b/nag/task.php index 5c504bd7471..ac982311353 100644 --- a/nag/task.php +++ b/nag/task.php @@ -134,7 +134,7 @@ function _delete($task_id, $tasklist_id) $GLOBALS['page_output']->addScriptFile('date/' . $datejs, 'horde'); $GLOBALS['page_output']->addScriptFile('date/date.js', 'horde'); $GLOBALS['page_output']->addScriptFile('task.js'); -$GLOBALS['page_output']->addScriptPackage('Keynavlist'); +$GLOBALS['page_output']->addScriptPackage('Horde_Core_Script_Package_Keynavlist'); $GLOBALS['page_output']->header(array( 'title' => $form->getTitle()