From 1f9dbdbce53ef4fe1c81c3f39374e78e8d044132 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Mon, 21 Jul 2014 13:38:50 +0000
Subject: [PATCH] * eTemplate2: fixed popups eg. tracker open empty, not
 rendering popup content

---
 phpgwapi/js/jsapi/egw.js | 41 ++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/phpgwapi/js/jsapi/egw.js b/phpgwapi/js/jsapi/egw.js
index 3caf158ee8..06d4e5f2f4 100644
--- a/phpgwapi/js/jsapi/egw.js
+++ b/phpgwapi/js/jsapi/egw.js
@@ -214,27 +214,28 @@
 			window.framework.setSidebox.apply(window.framework, JSON.parse(sidebox));
 		}
 
-		// load etemplate2 template(s)
-		$j('div.et2_container[data-etemplate]').each(function(index, node){
-			var data = JSON.parse(node.getAttribute('data-etemplate')) || {};
-			var currentapp = data.data.currentapp || window.egw_appName;
-			if(popup || window.opener)
-			{
-				// Resize popup when et2 load is done
-				jQuery(node).one("load",function() {
-					window.resizeTo(jQuery(document).width()+25,jQuery(document).height()+70);
-				});
-			}
-			var et2 = new etemplate2(node, currentapp+".etemplate_new.ajax_process_content.etemplate");
-			et2.load(data.name,data.url,data.data);
-			if (typeof data.response != 'undefined')
-			{
-				var json_request = egw(window).json();
-				json_request.handleResponse({response: data.response});
-			}
-		});
-
+		// rest needs DOM to be ready
 		$j(function() {
+			// load etemplate2 template(s)
+			$j('div.et2_container[data-etemplate]').each(function(index, node){
+				var data = JSON.parse(node.getAttribute('data-etemplate')) || {};
+				var currentapp = data.data.currentapp || window.egw_appName;
+				if(popup || window.opener)
+				{
+					// Resize popup when et2 load is done
+					jQuery(node).one("load",function() {
+						window.resizeTo(jQuery(document).width()+25,jQuery(document).height()+70);
+					});
+				}
+				var et2 = new etemplate2(node, currentapp+".etemplate_new.ajax_process_content.etemplate");
+				et2.load(data.name,data.url,data.data);
+				if (typeof data.response != 'undefined')
+				{
+					var json_request = egw(window).json();
+					json_request.handleResponse({response: data.response});
+				}
+			});
+
 			// set app-header
 			if (window.framework && egw_script.getAttribute('data-app-header'))
 			{