From 85c546801394f09840d46fe36335bc1fc7ddffe6 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 3 Jun 2014 08:17:43 +0000
Subject: [PATCH] fixed old tree stuff to use new dhtmlx locations, allways use
 dhtmlxtree/codebase/dhtmlxcommon.js

---
 phpgwapi/inc/class.egw_framework.inc.php  | 8 ++++----
 phpgwapi/inc/class.html.inc.php           | 8 ++++----
 phpgwapi/js/egw_action/egw_menu_dhtmlx.js | 2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index 194a059e87..cb328427b8 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -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');
diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index 3f10d346a6..7d07c59603 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -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;
 		}
diff --git a/phpgwapi/js/egw_action/egw_menu_dhtmlx.js b/phpgwapi/js/egw_action/egw_menu_dhtmlx.js
index f6451f907c..c290e33f4e 100644
--- a/phpgwapi/js/egw_action/egw_menu_dhtmlx.js
+++ b/phpgwapi/js/egw_action/egw_menu_dhtmlx.js
@@ -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;
 */