diff --git a/e107_admin/header.php b/e107_admin/header.php index 887f58c60..8fc1e9aff 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -398,11 +398,12 @@ e107::getJs()->renderJs('header', 5); * TODO - remove it from here, should be registered to e_jsmanager * or better - moved to core init.js(.php) */ - -e107::js('inline',"\$('e-js-css').remove(); +//\$('e-js-css').remove(); +e107::js('inline'," document.observe('dom:loaded', function () { e107Event.trigger('loaded', null, document); -});",'prototype',5); +}); +",'prototype',5); e107::getJs()->renderJs('header_inline', 5); diff --git a/e107_themes/templates/header_default.php b/e107_themes/templates/header_default.php index 7e9aeaa54..18d0bba08 100644 --- a/e107_themes/templates/header_default.php +++ b/e107_themes/templates/header_default.php @@ -389,7 +389,7 @@ e107::getJs()->renderJs('header_inline', 4); // [JSManager] Load JS Includes - Zone 5 - End of header JS, just before e_meta content and e107:loaded trigger e107::getJs()->renderJs('header', 5); -e107::getJs()->renderJs('header_inline', 5); + // // F: Send Meta Tags, Icon links @@ -510,17 +510,16 @@ if (count($js_body_onload)) $body_onload = " onload=\"".implode(" ",$js_body_onl * Fire Event e107:loaded * core JS available only in Prototype front-end environment */ +// e_css.php is removed +//\$('e-js-css').remove(); -echo "\n"; +e107::js('inline'," +document.observe('dom:loaded', function () { +e107Event.trigger('loaded', null, document); +}); +",'prototype',5); + +e107::getJs()->renderJs('header_inline', 5); echo " \n"; diff --git a/e107_web/js/e_jslib.php b/e107_web/js/e_jslib.php index b83fcaa90..6700a3d50 100644 --- a/e107_web/js/e_jslib.php +++ b/e107_web/js/e_jslib.php @@ -57,7 +57,7 @@ e_jslib_cache_out(); $_E107['minimal'] = true; //call jslib handler, render content -require_once ("../class2.php"); +require_once ("../../class2.php"); //require_once (e_HANDLER.'jslib_handler.php'); //$jslib = new e_jslib(); $jslib = e107::getObject('e_jslib', null, e_HANDLER.'jslib_handler.php'); @@ -224,7 +224,7 @@ function e_jslib_cache_path() if(null === $eJslibCacheDir) { - include('../e107_config.php'); + include('../../e107_config.php'); if($CACHE_DIRECTORY) {