using dhtmlxtree from sources instead of codebase directory, as does et2_widget_tree, to not double load it and causing 2. load to overwrite extensions from 1.

This commit is contained in:
Ralf Becker 2013-08-01 11:19:14 +00:00
parent a69df51eaa
commit 6f39b0618d

View File

@ -1199,9 +1199,9 @@ egw_LAB.wait(function() {
if (!$tree_initialised)
{
egw_framework::includeCSS('/phpgwapi/js/dhtmlxtree/dhtmlxTree/codebase/dhtmlxtree.css');
egw_framework::validate_file('dhtmlxtree','dhtmlxTree/codebase/dhtmlxcommon');
egw_framework::validate_file('dhtmlxtree','dhtmlxTree/codebase/dhtmlxtree');
if ($autoLoading && $dataMode != 'XML') egw_framework::validate_file('dhtmlxtree','dhtmlxTree/codebase/ext/dhtmlxtree_json');
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');
$tree_initialised = true;
if (!$_folders && !$autoLoading) return $html;
}