extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 00:54:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Return true after window close in et2_load, avoids 'Error while parsing et2_load response'

Browse Source 
- Catch trying to set a widget attribute with no set_...() function via JSON assign and warn instead of generic error
This commit is contained in:
Nathan Gray 2014-01-13 15:07:03 +00:00
parent be0878f883
commit 4eea706aa0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etemplate/js/etemplate2.js
View File

@ -744,6 +744,7 @@ function etemplate2_handle_load(_type, _response)
alert(data['window-close']);
}
window.close();
return true;
}
// handle egw_framework::window_focus()
@ -841,6 +842,11 @@ function etemplate2_handle_assign(type, res, req)
var widget = this.widgetContainer.getWidgetById(res.data.id);
if (widget)
{
if(typeof widget['set_' + res.data.key] != 'function')
{
egw.debug('warn', "Cannot set %s attribute %s via JSON assign, no set_%s()",res.data.id,res.data.key,res.data.key);
return false;
}
try
{
widget['set_' + res.data.key].call(widget,res.data.value);