From b3bf5b734fc7de0bda097c20056a3ecd53f1d7d3 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 18 Jul 2013 09:21:07 +0000
Subject: [PATCH] Make unique ID deterministic - use template name

---
 etemplate/inc/class.etemplate.inc.php | 9 +++++----
 etemplate/js/etemplate2.js            | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/etemplate/inc/class.etemplate.inc.php b/etemplate/inc/class.etemplate.inc.php
index 66e0161135..bb8d37ebdd 100644
--- a/etemplate/inc/class.etemplate.inc.php
+++ b/etemplate/inc/class.etemplate.inc.php
@@ -173,11 +173,12 @@ class etemplate_new extends etemplate_widget_template
 				$langRequire[] = array('app' => $l_app, 'lang' => $lang);
 			}
 
+			$dom_id = str_replace('.','-',$this->name);
 			// 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="' . $this->name .'" class="et2_container"></div>
+		<div id="' . $dom_id .'" class="et2_container"></div>
 		<script>
 			// Wait for all files to be loaded & executed first
 			egw_LAB.wait(function() {
@@ -198,7 +199,7 @@ class etemplate_new extends etemplate_widget_template
 					{
 						callback = function(et2) {app["'.$app.'"].et2_ready(et2)};
 					}
-					var et2 = new etemplate2(document.getElementById("'.$this->name.'"), "etemplate::ajax_process_content");
+					var et2 = new etemplate2(document.getElementById("'.$dom_id.'"), "etemplate::ajax_process_content");
 					et2.load("'.$this->name.'","'.$GLOBALS['egw_info']['server']['webserver_url'].$this->rel_path.'",'.json_encode($data).', callback);
 				}, window, egw.webserverUrl);
 			});
@@ -208,7 +209,7 @@ class etemplate_new extends etemplate_widget_template
 			else
 			{
 				echo '
-		<div id="container" class="et2_container"></div>
+		<div id="'.$dom_id.'" class="et2_container"></div>
 		<script>
 			// Wait for all files to be loaded & executed first
 			egw_LAB.wait(function() {
@@ -226,7 +227,7 @@ class etemplate_new extends etemplate_widget_template
 					{
 						callback = function(et2) {app["'.$app.'"].et2_ready(et2)};
 					}
-					var et2 = new etemplate2(document.getElementById("container"), "etemplate::ajax_process_content");
+					var et2 = new etemplate2(document.getElementById("'.$dom_id.'"), "etemplate::ajax_process_content");
 					et2.load("'.$this->name.'","'.$GLOBALS['egw_info']['server']['webserver_url'].$this->rel_path.'",'.json_encode($data).',callback);
 				}, null, true);
 			});
diff --git a/etemplate/js/etemplate2.js b/etemplate/js/etemplate2.js
index 146e9adfa7..4e57147444 100644
--- a/etemplate/js/etemplate2.js
+++ b/etemplate/js/etemplate2.js
@@ -84,7 +84,7 @@ function etemplate2(_container, _menuaction)
 	this.menuaction = _menuaction;
 	
 	// Unique ID to prevent DOM collisions across multiple templates
-	this.uniqueId = egw().uid() + "-" + _container.getAttribute("id");
+	this.uniqueId = _container.getAttribute("id").replace('.','-');
 	
 	// Preset the object variable
 	this.widgetContainer = null;