From: Michael J. Rubinsky Date: Mon, 21 Jun 2010 15:44:37 +0000 (-0400) Subject: Include Imples before headers so the required js can be included in X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a3356077b3b173c090e91eefc1ace1edca0353b0;p=horde.git Include Imples before headers so the required js can be included in the monolithic js file if using the js cache. --- diff --git a/kronolith/index.php b/kronolith/index.php index d7be36847..3d3f0ce13 100644 --- a/kronolith/index.php +++ b/kronolith/index.php @@ -96,14 +96,6 @@ foreach ($injector->getInstance('Horde_Alarm')->handlers() as $method => $handle $taskAlarmParams = substr($taskAlarmParams, 0, - 6) . ''; } -Kronolith::header(); -echo "\n"; -require KRONOLITH_TEMPLATES . '/index/index.inc'; -Horde::includeScriptFiles(); -Horde::outputInlineScript(); -if ($conf['maps']['driver']) { - Kronolith::initEventMap($conf['maps']); -} Horde_Ajax_Imple::factory( array('kronolith', 'TagAutoCompleter'), array('triggerId' => 'kronolithEventTags', @@ -130,4 +122,17 @@ Horde_Ajax_Imple::factory( 'var' => 'KronolithCore.attendeesAc')) ->attach(); +Kronolith::header(); +echo "\n"; +require KRONOLITH_TEMPLATES . '/index/index.inc'; +Horde::includeScriptFiles(); +Horde::outputInlineScript(); + +/* Maps must be initialized after scripts are output, to avoid having them + * included in the monolithic javascript file, which breaks loading the hordemap + * dependencies. */ +if ($conf['maps']['driver']) { + Kronolith::initEventMap($conf['maps']); +} + echo "\n";