extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-23 14:29:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

move actions stuff to api bundle, as loading just it fails with etemplate bundle split in two parts (fixes error reported on devel list)

Browse Source
This commit is contained in:
Ralf Becker 2014-03-04 09:10:58 +00:00
parent 0ad6f6cda6
commit 04442bb0cf
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1714,7 +1714,7 @@ if ($app == 'home') continue;
{ {
if ($path == '/phpgwapi/js/jsapi/egw.js') continue; // loaded via own tag, and we must not load it twice! if ($path == '/phpgwapi/js/jsapi/egw.js') continue; // loaded via own tag, and we must not load it twice!
$query = ''; unset($query);
list($path,$query) = explode('?',$path,2); list($path,$query) = explode('?',$path,2);
$mod = filemtime(EGW_SERVER_ROOT.$path); $mod = filemtime(EGW_SERVER_ROOT.$path);
@ -1771,9 +1771,22 @@ if ($app == 'home') continue;
// generate api bundle // generate api bundle
$inc_mgr->include_js_file('/phpgwapi/js/jquery/jquery.js'); $inc_mgr->include_js_file('/phpgwapi/js/jquery/jquery.js');
$inc_mgr->include_js_file('/phpgwapi/js/jquery/jquery-ui.js');
$inc_mgr->include_js_file('/phpgwapi/js/jsapi/jsapi.js'); $inc_mgr->include_js_file('/phpgwapi/js/jsapi/jsapi.js');
$inc_mgr->include_js_file('/phpgwapi/js/egw_json.js'); $inc_mgr->include_js_file('/phpgwapi/js/egw_json.js');
$inc_mgr->include_js_file('/phpgwapi/js/jsapi/egw.js'); $inc_mgr->include_js_file('/phpgwapi/js/jsapi/egw.js');
// dhtmlx tree & menu
$inc_mgr->include_js_file('/phpgwapi/js/dhtmlxtree/dhtmlxTree/sources/dhtmlxcommon.js');
$inc_mgr->include_js_file('/phpgwapi/js/dhtmlxtree/dhtmlxTree/sources/dhtmlxtree.js');
$inc_mgr->include_js_file('/phpgwapi/js/dhtmlxtree/dhtmlxMenu/sources/dhtmlxmenu.js');
// actions
$inc_mgr->include_js_file('/phpgwapi/js/egw_action/egw_action.js');
$inc_mgr->include_js_file('/phpgwapi/js/egw_action/egw_keymanager.js');
$inc_mgr->include_js_file('/phpgwapi/js/egw_action/egw_action_popup.js');
$inc_mgr->include_js_file('/phpgwapi/js/egw_action/egw_action_dragdrop.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_dhtmlx.js');
$bundles['api'] = $inc_mgr->get_included_files(); $bundles['api'] = $inc_mgr->get_included_files();
// generate et2 bundle (excluding files in api bundle) // generate et2 bundle (excluding files in api bundle)

4
phpgwapi/js/egw_action/egw_dragdrop_dhtmlx_tree.js
View File

@ -9,6 +9,10 @@
* @version $Id$ * @version $Id$
*/ */
/*egw:uses
egw_action;
*/
/** /**
* This file contains an egw_actionObjectInterface which allows a dhtmlx tree * This file contains an egw_actionObjectInterface which allows a dhtmlx tree
* row to be a drag target and contains a function which transforms a complete * row to be a drag target and contains a function which transforms a complete

6
phpgwapi/js/egw_action/egw_menu_dhtmlx.js
View File

@ -11,9 +11,9 @@
/*egw:uses /*egw:uses
egw_menu; egw_menu;
/phpgwapi/js/dhtmlxtree/dhtmlxMenu/codebase/dhtmlxcommon.js; /phpgwapi/js/dhtmlxtree/dhtmlxTenu/sources/dhtmlxcommon.js;
/phpgwapi/js/dhtmlxtree/dhtmlxMenu/codebase/dhtmlxmenu.js; /phpgwapi/js/dhtmlxtree/dhtmlxMenu/sources/dhtmlxmenu.js;
/phpgwapi/js/dhtmlxtree/dhtmlxMenu/codebase/ext/dhtmlxmenu_ext.js; /phpgwapi/js/dhtmlxtree/dhtmlxMenu/sources/ext/dhtmlxmenu_ext.js;
*/ */
// Need CSS, or it doesn't really work // Need CSS, or it doesn't really work