extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 04:11:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make unique ID deterministic - use template name

Browse Source
This commit is contained in:
Nathan Gray 2013-07-18 09:21:07 +00:00
parent 524f2b0f03
commit b3bf5b734f
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etemplate/inc/class.etemplate.inc.php
View File

@ -173,11 +173,12 @@ class etemplate_new extends etemplate_widget_template
$langRequire[] = array('app' => $l_app, 'lang' => $lang); $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) // check if we are in an ajax-exec call from jdots template (or future other tabed templates)
if (isset($GLOBALS['egw']->framework->response)) if (isset($GLOBALS['egw']->framework->response))
{ {
echo ' echo '
<div id="' . $this->name .'" class="et2_container"></div> <div id="' . $dom_id .'" class="et2_container"></div>
<script> <script>
// Wait for all files to be loaded & executed first // Wait for all files to be loaded & executed first
egw_LAB.wait(function() { egw_LAB.wait(function() {
@ -198,7 +199,7 @@ class etemplate_new extends etemplate_widget_template
{ {
callback = function(et2) {app["'.$app.'"].et2_ready(et2)}; 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); et2.load("'.$this->name.'","'.$GLOBALS['egw_info']['server']['webserver_url'].$this->rel_path.'",'.json_encode($data).', callback);
}, window, egw.webserverUrl); }, window, egw.webserverUrl);
}); });
@ -208,7 +209,7 @@ class etemplate_new extends etemplate_widget_template
else else
{ {
echo ' echo '
<div id="container" class="et2_container"></div> <div id="'.$dom_id.'" class="et2_container"></div>
<script> <script>
// Wait for all files to be loaded & executed first // Wait for all files to be loaded & executed first
egw_LAB.wait(function() { egw_LAB.wait(function() {
@ -226,7 +227,7 @@ class etemplate_new extends etemplate_widget_template
{ {
callback = function(et2) {app["'.$app.'"].et2_ready(et2)}; 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); et2.load("'.$this->name.'","'.$GLOBALS['egw_info']['server']['webserver_url'].$this->rel_path.'",'.json_encode($data).',callback);
}, null, true); }, null, true);
}); });

2
etemplate/js/etemplate2.js
View File

@ -84,7 +84,7 @@ function etemplate2(_container, _menuaction)
this.menuaction = _menuaction; this.menuaction = _menuaction;
// Unique ID to prevent DOM collisions across multiple templates // 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 // Preset the object variable
this.widgetContainer = null; this.widgetContainer = null;