holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix javascript error stalling eT2 rendering, if option label is null eg. because it could not be json encoded because of non-utf8 chars in it

Browse Source
This commit is contained in:
Ralf Becker 2015-03-19 10:54:49 +00:00
parent 13229bbe3b
commit aa930e75d6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
etemplate/js/et2_widget_selectbox.js
View File

@ -649,7 +649,7 @@ var et2_selectbox = et2_inputWidget.extend(
// Translate the options // Translate the options
if(!this.options.no_lang) if(!this.options.no_lang)
{ {
if (typeof _options[key] === 'object') if (typeof _options[key] === 'object' && _options[key] !== null)
{ {
if(_options[key]["label"]) _options[key]["label"] = this.egw().lang(_options[key]["label"]); if(_options[key]["label"]) _options[key]["label"] = this.egw().lang(_options[key]["label"]);
if(_options[key]["title"]) _options[key]["title"] = this.egw().lang(_options[key]["title"]); if(_options[key]["title"]) _options[key]["title"] = this.egw().lang(_options[key]["title"]);
@ -660,7 +660,7 @@ var et2_selectbox = et2_inputWidget.extend(
} }
} }
if (typeof _options[key] === 'object' && _options[key] != null) if (typeof _options[key] === 'object' && _options[key] !== null)
{ {
// Optgroup // Optgroup
if(typeof _options[key]["label"] == 'undefined' && typeof _options[key]["title"] == "undefined") if(typeof _options[key]["label"] == 'undefined' && typeof _options[key]["title"] == "undefined")
@ -677,7 +677,7 @@ var et2_selectbox = et2_inputWidget.extend(
for(var sub in _options[key]) for(var sub in _options[key])
{ {
if (typeof _options[key][sub] === 'object') if (typeof _options[key][sub] === 'object' && _options[key][sub] !== null)
{ {
this._appendOptionElement(sub, this._appendOptionElement(sub,
_options[key][sub]["label"] ? _options[key][sub]["label"] : "", _options[key][sub]["label"] ? _options[key][sub]["label"] : "",