mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-20 21:32:09 +02:00
Code Issues Releases Wiki Activity

JS libraries, CDN frameworks, external script loading should work now in all possible administration preference sets

Browse Source
This commit is contained in:
secretr
2012-11-16 14:16:53 +00:00
parent 539efe643a
commit 2671dde288
2 changed files with 68 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
e107_handlers/jslib_handler.php
View File

@@ -52,10 +52,21 @@ class e_jslib
// FIXED: option to use external sources (e.g. google) even if JS is combined (script tags for external sources)
if(!e107::getPref('e_jslib_nocombine'))
{
$e_jsmanager = e107::getJs();
// render CDN frameworks
$ret .= $e_jsmanager->renderJs('framework', null, true, true);
$hash = md5(serialize(varset($pref['e_jslib'])).e107::getPref('e_jslib_browser_cache', 0).THEME.e_LANGUAGE.ADMIN).'_'.$where;
// TODO disable cache in debug mod
$hash .= (e107::getPref('e_jslib_nocache')/* || deftrue('e_NOCACHE')*/ ? '_nocache' : '').(!e107::getPref('e_jslib_nobcache') || deftrue('e_NOCACHE') ? '_nobcache' : '').(e107::getPref('e_jslib_gzip') ? '' : '_nogzip');
$ret .= "<script type='text/javascript' src='".e_FILE_ABS."e_jslib.php?{$hash}'></script>\n";
// render CDN libraries asap
$ret .= $e_jsmanager->renderJs('core', null, true, true);
$ret .= $e_jsmanager->renderJs('plugin', null, true, true);
$ret .= $e_jsmanager->renderJs('theme', null, true, true);
if($return) return $ret;
echo $ret;
return;