From 04442bb0cf4173dd6553d283d860f535beac46f1 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Tue, 4 Mar 2014 09:10:58 +0000
Subject: [PATCH] move actions stuff to api bundle, as loading just it fails
 with etemplate bundle split in two parts (fixes error reported on devel list)

---
 phpgwapi/inc/class.egw_framework.inc.php          | 15 ++++++++++++++-
 .../js/egw_action/egw_dragdrop_dhtmlx_tree.js     |  4 ++++
 phpgwapi/js/egw_action/egw_menu_dhtmlx.js         |  6 +++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php
index 3d6e4827e6..796f004c72 100644
--- a/phpgwapi/inc/class.egw_framework.inc.php
+++ b/phpgwapi/inc/class.egw_framework.inc.php
@@ -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!
 
-			$query = '';
+			unset($query);
 			list($path,$query) = explode('?',$path,2);
 			$mod = filemtime(EGW_SERVER_ROOT.$path);
 
@@ -1771,9 +1771,22 @@ if ($app == 'home') continue;
 
 		// generate api bundle
 		$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/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');
+		// 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();
 
 		// generate et2 bundle (excluding files in api bundle)
diff --git a/phpgwapi/js/egw_action/egw_dragdrop_dhtmlx_tree.js b/phpgwapi/js/egw_action/egw_dragdrop_dhtmlx_tree.js
index 3811bc86df..a54e958c2e 100644
--- a/phpgwapi/js/egw_action/egw_dragdrop_dhtmlx_tree.js
+++ b/phpgwapi/js/egw_action/egw_dragdrop_dhtmlx_tree.js
@@ -9,6 +9,10 @@
  * @version $Id$
  */
 
+/*egw:uses
+	egw_action;
+*/
+
 /**
 * 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
diff --git a/phpgwapi/js/egw_action/egw_menu_dhtmlx.js b/phpgwapi/js/egw_action/egw_menu_dhtmlx.js
index 38b6c9a6d6..197db1bace 100644
--- a/phpgwapi/js/egw_action/egw_menu_dhtmlx.js
+++ b/phpgwapi/js/egw_action/egw_menu_dhtmlx.js
@@ -11,9 +11,9 @@
 
 /*egw:uses
 	egw_menu;
-	/phpgwapi/js/dhtmlxtree/dhtmlxMenu/codebase/dhtmlxcommon.js;
-	/phpgwapi/js/dhtmlxtree/dhtmlxMenu/codebase/dhtmlxmenu.js;
-	/phpgwapi/js/dhtmlxtree/dhtmlxMenu/codebase/ext/dhtmlxmenu_ext.js;
+	/phpgwapi/js/dhtmlxtree/dhtmlxTenu/sources/dhtmlxcommon.js;
+	/phpgwapi/js/dhtmlxtree/dhtmlxMenu/sources/dhtmlxmenu.js;
+	/phpgwapi/js/dhtmlxtree/dhtmlxMenu/sources/ext/dhtmlxmenu_ext.js;
 */
 
 // Need CSS, or it doesn't really work