etemplate: et2_widget_dialog.js etemplate2.js

ralfbecker_sf 2016-03-21 15:31:02 UTC #1

Author: ralfbecker
New Revision: 55457

URL: http://svn.stylite.de/viewvc/egroupware?rev=55457&view=rev
Log:
do NOT call et2_ready for dialogs with a template, as it would overwrite this.et2 in app.js

Modified:
trunk/egroupware/api/js/etemplate/et2_widget_dialog.js
trunk/egroupware/api/js/etemplate/etemplate2.js

Modified: trunk/egroupware/api/js/etemplate/et2_widget_dialog.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/js/etemplate/et2_widget_dialog.js?rev=55457&r1=55456&r2=55457&view=diff

— trunk/egroupware/api/js/etemplate/et2_widget_dialog.js (original)
+++ trunk/egroupware/api/js/etemplate/et2_widget_dialog.js Mon Mar 21 16:31:02 2016
@@ -428,7 +428,9 @@
else
{
// Just template name, it better be loaded already

  	this.template.load(template,'',this.options.value||{});

  	this.template.load(template, '', this.options.value || {},

  		// true: do NOT call et2_ready, as it would overwrite this.et2 in app.js

  		undefined, undefined, true);
  }
  // set template-name as id, to allow to style dialogs
  this.div.children().attr('id', template.replace(/^(.*\/)?([^/]+)(\.xet)?$/, '$2').replace(/\./g, '-'));

Modified: trunk/egroupware/api/js/etemplate/etemplate2.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/js/etemplate/etemplate2.js?rev=55457&r1=55456&r2=55457&view=diff

— trunk/egroupware/api/js/etemplate/etemplate2.js (original)
+++ trunk/egroupware/api/js/etemplate/etemplate2.js Mon Mar 21 16:31:02 2016
@@ -333,8 +333,9 @@

@param {object} _data object with attributes content, langRequire, etemplate_exec_id, …
@param {function} _callback called after tempalte is loaded
@param {object} _app local app object

*/
-etemplate2.prototype.load = function(_name, _url, _data, _callback, _app)

- @param {boolean} _no_et2_ready true: do not send et2_ready, used by et2_dialog to not overwrite app.js et2 object
*/
+etemplate2.prototype.load = function(_name, _url, _data, _callback, _app, _no_et2_ready)
{
var app = _app || window.app;
this.name = _name; // store top-level template name to have it available in widgets
@@ -529,11 +530,11 @@
{
_callback.call(window,this,_name);
}

  		if(app_callback && _callback != app_callback)

  		if(app_callback && _callback != app_callback && !_no_et2_ready)
  		{
  			app_callback.call(window,this,_name);
  		}

  		if(appname && appname != this.app && typeof app[this.app] == "object")

  		if(appname && appname != this.app && typeof app[this.app] == "object" && !_no_et2_ready)
  		{
  			// Loaded a template from a different application?
  			// Let the application that loaded it know too

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs