extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-30 18:49:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

switching jdots bundle off, as fw_pixelegg will cause whole jdots bundle incl. fw_jdots to include

Browse Source
This commit is contained in:
Ralf Becker 2014-12-09 16:39:42 +00:00
parent 6dcb8cbbf5
commit ef84797019
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -2071,12 +2071,13 @@ abstract class egw_framework
self::bundle_urls($bundles['et2'], $et2_max_mod); self::bundle_urls($bundles['et2'], $et2_max_mod);
// generate jdots bundle, if installed // generate jdots bundle, if installed
/* switching jdots bundle off, as fw_pixelegg will cause whole jdots bundle incl. fw_jdots to include
if (file_exists(EGW_SERVER_ROOT.'/jdots')) if (file_exists(EGW_SERVER_ROOT.'/jdots'))
{ {
$inc_mgr->include_js_file('/jdots/js/fw_jdots.js'); $inc_mgr->include_js_file('/jdots/js/fw_jdots.js');
$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));
self::bundle_urls($bundles['jdots'], $jdots_max_mod); self::bundle_urls($bundles['jdots'], $jdots_max_mod);
} }*/
// automatic split bundles with more then MAX_BUNDLE_FILES (=50) files // automatic split bundles with more then MAX_BUNDLE_FILES (=50) files
foreach($bundles as $name => $files) foreach($bundles as $name => $files)