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

- Keep internal value synced with widget value

Browse Source 
- Handle case when rows attribute is specified, and rows legacy option is used for empty_label
This commit is contained in:
Nathan Gray 2012-07-10 22:20:13 +00:00
parent c1a7b2de01
commit f29d9ce72d
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
etemplate/js/et2_widget_selectbox.js
View File

@ -66,6 +66,12 @@ var et2_selectbox = et2_inputWidget.extend({
this.input = null; this.input = null;
this.value = ''; this.value = '';
// Grab value if already available
if(typeof this.options.value != 'undefined')
{
this.value = this.options.value;
}
// Allow no other widgets inside this one // Allow no other widgets inside this one
this.supportedWidgetClasses = []; this.supportedWidgetClasses = [];
@ -351,6 +357,17 @@ var et2_selectbox = et2_inputWidget.extend({
}, },
loadFromXML: function(_node) { loadFromXML: function(_node) {
// Handle special case where legacy option for empty label is used (conflicts with rows), and rows is set as an attribute
var legacy;
if(legacy = _node.getAttribute("options"))
{
var legacy = legacy.split(",");
if(legacy.length && isNaN(legacy[0]))
{
this.options.empty_label = legacy[0];
}
}
// Read the option-tags // Read the option-tags
var options = et2_directChildrenByTagName(_node, "options"); var options = et2_directChildrenByTagName(_node, "options");
for (var i = 0; i < options.length; i++) for (var i = 0; i < options.length; i++)
@ -506,12 +523,13 @@ var et2_selectbox = et2_inputWidget.extend({
{ {
var value = []; var value = [];
jQuery("input:checked",this.multiOptions).each(function(){value.push(this.value);}); jQuery("input:checked",this.multiOptions).each(function(){value.push(this.value);});
return value; this.value = value;
} }
else else
{ {
return this._super.apply(this, arguments); this.value = this._super.apply(this, arguments);
} }
return this.value;
} }
}); });