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

fixed old tree stuff to use new dhtmlx locations, allways use dhtmlxtree/codebase/dhtmlxcommon.js

Browse Source
This commit is contained in:
Ralf Becker 2014-06-03 08:17:43 +00:00
parent 48d3f93fa3
commit 85c5468013
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1804,10 +1804,10 @@ if ($app == 'home') continue;
$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/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');
// dhtmlxTree (dhtmlxMenu get loaded via dependency in egw_menu_dhtmlx.js)
$inc_mgr->include_js_file('/phpgwapi/js/dhtmlxtree/codebase/dhtmlxcommon.js');
$inc_mgr->include_js_file('/phpgwapi/js/dhtmlxtree/sources/dhtmlxtree.js');
$inc_mgr->include_js_file('/phpgwapi/js/dhtmlxtree/sources/ext/dhtmlxtree_json.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');

8
phpgwapi/inc/class.html.inc.php
View File

@ -1289,10 +1289,10 @@ egw_LAB.wait(function() {
static $tree_initialised=false;
if (!$tree_initialised)
{
egw_framework::includeCSS('/phpgwapi/js/dhtmlxtree/dhtmlxTree/codebase/dhtmlxtree.css');
egw_framework::validate_file('dhtmlxtree','dhtmlxTree/sources/dhtmlxcommon');
egw_framework::validate_file('dhtmlxtree','dhtmlxTree/sources/dhtmlxtree');
if ($autoLoading && $dataMode != 'XML') egw_framework::validate_file('dhtmlxtree','dhtmlxTree/sources/ext/dhtmlxtree_json');
egw_framework::includeCSS('/phpgwapi/js/dhtmlxtree/codebase/dhtmlxtree.css');
egw_framework::validate_file('/phpgwapi/js/dhtmlxtree/codebase/dhtmlxcommon.js');
egw_framework::validate_file('/phpgwapi/js/dhtmlxtree/sources/dhtmlxtree.js');
if ($autoLoading && $dataMode != 'XML') egw_framework::validate_file('/phpgwapi/js/dhtmlxtree/sources/ext/dhtmlxtree_json.js');
$tree_initialised = true;
if (!$_folders && !$autoLoading) return null;
}

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

@ -11,7 +11,7 @@
/*egw:uses
egw_menu;
/phpgwapi/js/dhtmlxMenu/sources/dhtmlxcommon.js;
/phpgwapi/js/dhtmlxtree/codebase/dhtmlxcommon.js;
/phpgwapi/js/dhtmlxMenu/sources/dhtmlxmenu.js;
/phpgwapi/js/dhtmlxMenu/sources/ext/dhtmlxmenu_ext.js;
*/