extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Little fixes to avoid some errors:

Browse Source 
- Make sure widget is still there before trying to set its select options
- Make sure expand button is there before trying to remove it
- Only try to set select options if header widget is a select box
- Pass appropriate options into getEntry() so it can return null on not existing keys
This commit is contained in:
Nathan Gray 2015-07-09 19:12:13 +00:00
parent 34536f7e89
commit 3cf6211c95
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etemplate/js/et2_core_valueWidget.js
View File

@ -56,7 +56,7 @@ var et2_valueWidget = et2_baseWidget.extend(
// Set the value for this element // Set the value for this element
var contentMgr = this.getArrayMgr("content"); var contentMgr = this.getArrayMgr("content");
if (contentMgr != null) { if (contentMgr != null) {
var val = contentMgr.getEntry(this.id); var val = contentMgr.getEntry(this.id,false,true);
if (val !== null) if (val !== null)
{ {
_attrs["value"] = val; _attrs["value"] = val;

7
etemplate/js/et2_extension_nextmatch.js
View File

@ -3386,7 +3386,10 @@ var et2_nextmatch_customfilter = et2_nextmatch_filterheader.extend(
this.real_node._type = _attrs.widget_type; this.real_node._type = _attrs.widget_type;
et2_selectbox.find_select_options(this.real_node, select_options, _attrs); et2_selectbox.find_select_options(this.real_node, select_options, _attrs);
this.real_node._type = correct_type; this.real_node._type = correct_type;
this.real_node.set_select_options(select_options); if(typeof this.real_node.set_select_options === 'function')
{
this.real_node.set_select_options(select_options);
}
}, },
// Just pass the real DOM node through, in case anybody asks // Just pass the real DOM node through, in case anybody asks
@ -3396,7 +3399,7 @@ var et2_nextmatch_customfilter = et2_nextmatch_filterheader.extend(
// Also need to pass through real children // Also need to pass through real children
getChildren: function() { getChildren: function() {
return this.real_node.getChildren(); return this.real_node.getChildren() || [];
}, },
setNextmatch: function(_nextmatch) setNextmatch: function(_nextmatch)
{ {

8
etemplate/js/et2_widget_selectbox.js
View File

@ -553,7 +553,7 @@ var et2_selectbox = et2_inputWidget.extend(
this.options.expand_multiple_rows = _rows; this.options.expand_multiple_rows = _rows;
var surroundings = this.getSurroundings(); var surroundings = this.getSurroundings();
if(_rows <= 1 ) if(_rows <= 1 && this.expand_button )
{ {
// Remove // Remove
surroundings.removeDOMNode(this.expand_button.get(0)); surroundings.removeDOMNode(this.expand_button.get(0));
@ -1099,7 +1099,11 @@ jQuery.extend(et2_selectbox,
attrs.select_options = egw.window.et2_selectbox.type_cache[this.cache_id]; attrs.select_options = egw.window.et2_selectbox.type_cache[this.cache_id];
egw.window.setTimeout(jQuery.proxy(function() { egw.window.setTimeout(jQuery.proxy(function() {
this.widget.set_select_options(et2_selectbox.find_select_options(this.widget,{}, this.widget.options)); // Avoid errors if widget is destroyed before the timeout
if(this.widget && typeof this.widget.id !== 'undefined')
{
this.widget.set_select_options(et2_selectbox.find_select_options(this.widget,{}, this.widget.options));
}
},this),1); },this),1);
},{widget:widget,cache_id:cache_id})); },{widget:widget,cache_id:cache_id}));
return []; return [];