holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

load chosen and CKEditor as part of API javascript boundle, as they are used be old eTemplate to and loading only one of the two et2 bundles fails

Browse Source
This commit is contained in:
Ralf Becker 2015-06-08 14:34:20 +00:00
parent 41b60e9e12
commit 4c19e714bb
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2009,6 +2009,7 @@ abstract class egw_framework
{ {
if (($bundle = $file2bundle[$file])) if (($bundle = $file2bundle[$file]))
{ {
//error_log(__METHOD__."() requiring boundle $bundle for $file");
if (!in_array($bundle, $included_bundles)) if (!in_array($bundle, $included_bundles))
{ {
$max_modified = 0; $max_modified = 0;
@ -2132,6 +2133,11 @@ abstract class egw_framework
$inc_mgr->include_js_file('/phpgwapi/js/egw_action/egw_dragdrop_dhtmlx_tree.js'); $inc_mgr->include_js_file('/phpgwapi/js/egw_action/egw_dragdrop_dhtmlx_tree.js');
$inc_mgr->include_js_file('/phpgwapi/js/egw_action/egw_menu.js'); $inc_mgr->include_js_file('/phpgwapi/js/egw_action/egw_menu.js');
$inc_mgr->include_js_file('/phpgwapi/js/egw_action/egw_menu_dhtmlx.js'); $inc_mgr->include_js_file('/phpgwapi/js/egw_action/egw_menu_dhtmlx.js');
// include choosen in api, as old eTemplate uses it and fail if it pulls in half of et2
$inc_mgr->include_js_file('/phpgwapi/js/jquery/chosen/chosen.jquery.js');
// include CKEditor in api, as old eTemplate uses it too
$inc_mgr->include_js_file('/phpgwapi/js/ckeditor/ckeditor.js');
$inc_mgr->include_js_file('/phpgwapi/js/ckeditor/config.js');
$bundles['api'] = $inc_mgr->get_included_files(); $bundles['api'] = $inc_mgr->get_included_files();
self::bundle_urls($bundles['api'], $api_max_mod); self::bundle_urls($bundles['api'], $api_max_mod);