From bfc0c4821056504d022c2256b512d32f072e13f0 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 13 Feb 2013 16:30:30 +0000
Subject: [PATCH] use egw.includeJS instead of egw.ready for ajax-exec, eg.
 used in mail

---
 etemplate/inc/class.etemplate.inc.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 44b6a77325..976e327907 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -174,7 +174,25 @@ class etemplate_new extends etemplate_widget_template
 				$langRequire[] = array('app' => $app, 'lang' => $lang);
 			}
 
-			echo '
+			// check if we are in an ajax-exec call from jdots template (or future other tabed templates)
+			if (isset($GLOBALS['egw']->framework->response))
+			{
+				echo '
+		<div id="container"></div>
+		<script>
+			egw.langRequire(window, '.json_encode($langRequire).');
+			egw(window).includeJS('.json_encode(egw_framework::get_script_links(true, true)).	// return and clear
+				',function() {
+				egw.debug("info", "Instanciating etemplate2 object for '.$this->name.'");
+				var et2 = new etemplate2(document.getElementById("container"), "etemplate::ajax_process_content");
+				et2.load("'.$this->name.'","'.$GLOBALS['egw_info']['server']['webserver_url'].$this->rel_path.'",'.json_encode($data).');
+			}, window, egw.webserverUrl);
+		</script>
+';
+			}
+			else
+			{
+				echo '
 		<div id="container"></div>
 		<script>
 			egw.langRequire(window, '.json_encode($langRequire).');
@@ -184,6 +202,7 @@ class etemplate_new extends etemplate_widget_template
 			}, null, true);
 		</script>
 ';
+			}
 			common::egw_footer();
 		}
 	}