mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 14:46:56 +02:00
Code Issues Releases Wiki Activity

Testing of loading all javascript in the footer. Add the following to e107_config.php to test: define('e_DEBUG_JS_FOOTER', true);

Browse Source
This commit is contained in:
Cameron
2021-01-25 13:23:28 -08:00
parent 46af21d105
commit 1479e9ba59
2 changed files with 36 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_core/templates/footer_default.php
View File

@@ -280,6 +280,14 @@ if ((ADMIN == true || $pref['developer']) && count($error_handler->errors) && $e
//
// E Last themed footer code, usually JS
//
if(deftrue('e_DEBUG_JS_FOOTER'))
{
renderAllJavascript();
}
if (function_exists('theme_foot'))
{
echo theme_foot();

86
e107_core/templates/header_default.php
View File

@@ -341,51 +341,41 @@ unset($CSSORDER);
$e_js->renderCached('css');
/*
$e_js->renderJs('other_css', false, 'css', false);
echo "\n<!-- footer_other_css -->\n";
// Core CSS
$e_js->renderJs('core_css', false, 'css', false);
echo "\n<!-- footer_core_css -->\n";
// Plugin CSS
$e_js->renderJs('plugin_css', false, 'css', false);
echo "\n<!-- footer_plugin_css -->\n";
// Theme CSS
//echo "<!-- Theme css -->\n";
$e_js->renderJs('theme_css', false, 'css', false);
echo "\n<!-- footer_theme_css -->\n";
// Inline CSS - not sure if this should stay at all!
$e_js->renderJs('inline_css', false, 'css', false);
echo "\n<!-- footer_inline_css -->\n";
*/
//
// Style for unobtrusive JS, prevent 3rd party code overload
//
// require_once(e_FILE."/e_css.php"); see e107_web/css/e107.css
//
// E: Send JS all in once
// Read here why - http://code.google.com/speed/page-speed/docs/rtt.html#PutStylesBeforeScripts
function renderAllJavascript()
{
// [JSManager] Load JS Includes - Zone 1 - Before Library
e107::getJs()->renderJs('header', 1);
e107::getJs()->renderJs('header_inline', 1);
e107::getJs()->renderJs('header', 1);
e107::getJs()->renderJs('header_inline', 1);
// Send Javascript Libraries ALWAYS (for now) - loads e_jslib.php
$jslib = e107::getObject('e_jslib', null, e_HANDLER.'jslib_handler.php');
$jslib->renderHeader('front', false);
$jslib = e107::getObject('e_jslib', null, e_HANDLER . 'jslib_handler.php');
$jslib->renderHeader('front', false);
// [JSManager] Load JS Includes - Zone 2 - After Library
e107::getJs()->renderJs('header', 2);
e107::getJs()->renderJs('header_inline', 2);
e107::getJs()->renderJs('header', 2);
e107::getJs()->renderJs('header_inline', 2);
// [JSManager] Load JS Includes - Zone 3 - After e_plug/theme.js, before headerjs()
e107::getJs()->renderJs('header', 3);
e107::getJs()->renderJs('header_inline', 3);
// [JSManager] Load JS Includes - Zone 4 - After headerjs
e107::getJs()->renderJs('header', 4);
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);
}
if(!deftrue('e_DEBUG_JS_FOOTER'))
{
renderAllJavascript();
}
// Send Plugin JS Files
//DEPRECATED, $eplug_js will be removed soon - use e107::getJs()->headerPlugin('myplug', 'myplug/js/my.js');
@@ -434,34 +424,14 @@ if (!USER && ($pref['user_tracking'] == "session") && varset($pref['password_CHA
$js_body_onload[] = "getChallenge();";
}
//headerjs moved below
// Deprecated function finally removed
//if(function_exists('core_head')){ echo core_head(); }
// [JSManager] Load JS Includes - Zone 3 - After e_plug/theme.js, before headerjs()
e107::getJs()->renderJs('header', 3);
e107::getJs()->renderJs('header_inline', 3);
// [JSManager] Load JS Includes - Zone 4 - After headerjs
e107::getJs()->renderJs('header', 4);
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);
//
// F: Send Meta Tags, Icon links
// F: Send Legacy Meta Tags, Icon links
//
// --- Send plugin Meta --------
echo $e_meta_content; // e_meta already loaded
//
// G: Send Theme Headers
// G: Send Legacy Theme Headers
//
if(function_exists('theme_head'))
{