automatic split bundles with more then 50 files into chunks, as IE11 does NOT cache them otherwise

This commit is contained in:
Ralf Becker 2014-02-17 17:15:37 +00:00
parent a1183839b0
commit e6052f9704

View File

@ -1645,6 +1645,7 @@ if ($app == 'home') continue;
if ($GLOBALS['egw_info']['server']['debug_minify'] !== 'True') if ($GLOBALS['egw_info']['server']['debug_minify'] !== 'True')
{ {
// get used bundles and cache them on tree-level for 2h // get used bundles and cache them on tree-level for 2h
//$bundles = self::get_bundles(); egw_cache::setTree(__CLASS__, 'bundles', $bundles, 7200);
$bundles = egw_cache::getTree(__CLASS__, 'bundles', array(__CLASS__, 'get_bundles'), array(), 7200); $bundles = egw_cache::getTree(__CLASS__, 'bundles', array(__CLASS__, 'get_bundles'), array(), 7200);
$bundles_ts = $bundles['.ts']; $bundles_ts = $bundles['.ts'];
unset($bundles['.ts']); unset($bundles['.ts']);
@ -1739,6 +1740,17 @@ if ($app == 'home') continue;
return $to_include; return $to_include;
} }
/**
* Maximum number of files in a bundle
*
* We split bundles, if they contain more then these number of files,
* because IE silently stops caching them, if Content-Length get's too big.
*
* IE11 cached 142kb compressed api bundle, but not 190kb et2 bundle.
* Splitting et2 bundle in max 50 files chunks, got IE11 to cache both bundles.
*/
const MAX_BUNDLE_FILES = 50;
/** /**
* Return typical bundes we use: * Return typical bundes we use:
* - api stuff phpgwapi/js/jsapi/* and it's dependencies incl. jquery * - api stuff phpgwapi/js/jsapi/* and it's dependencies incl. jquery
@ -1772,10 +1784,21 @@ if ($app == 'home') continue;
$bundles['jdots'] = array_diff($inc_mgr->get_included_files(), call_user_func_array('array_merge', $bundles)); $bundles['jdots'] = array_diff($inc_mgr->get_included_files(), call_user_func_array('array_merge', $bundles));
} }
// automatic split bundles with more then MAX_BUNDLE_FILES (=50) files
foreach($bundles as $name => $files)
{
$n = '';
while (count($files) > self::MAX_BUNDLE_FILES*(int)$n)
{
$files80 = array_slice($files, self::MAX_BUNDLE_FILES*(int)$n, self::MAX_BUNDLE_FILES, true);
$bundles[$name.$n++] = $files80;
}
}
// store timestamp of when bundle-config was created // store timestamp of when bundle-config was created
$bundles['.ts'] = time(); $bundles['.ts'] = time();
error_log(__METHOD__."() returning ".array2string($bundles)); //error_log(__METHOD__."() returning ".array2string($bundles));
return $bundles; return $bundles;
} }