X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fform%2FComboBoxArray.js;h=68fdf1e767fb861f89e4580d519567d8b1c557e7;hb=a4e5ae82af3ce69ec02d62ebce05f9b0ab6f7bd5;hp=9ccaf2492da8e94c02c06680c3b35403c79d253f;hpb=fbbfb14e4c5424412c3ce82ffdf03354f4eb2106;p=roojs1 diff --git a/Roo/form/ComboBoxArray.js b/Roo/form/ComboBoxArray.js index 9ccaf2492d..68fdf1e767 100644 --- a/Roo/form/ComboBoxArray.js +++ b/Roo/form/ComboBoxArray.js @@ -83,7 +83,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, // private - the hidden field el. hiddenEl : false, - boxWidth : 200, // use to set the box around the entry.. + el : false, //validateValue : function() { return true; }, // all values are ok! //onAddClick: function() { }, @@ -102,6 +102,11 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, this.combo = Roo.factory(this.combo, Roo.form); this.combo.onRender(ct, position); + // assigned so form know we need to do this.. + this.store = this.combo.store; + this.valueField = this.combo.valueField; + this.displayField = this.combo.displayField ; + this.combo.wrap.addClass('x-cbarray-grp'); @@ -171,13 +176,15 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, { // returns hidden if it's set.. if (!this.rendered) {return ''}; - return this.hiddenListName; + return this.hiddenName ? this.hiddenName : this.name; }, onResize: function(w, h){ + return; + // not sure if this is needed.. this.combo.onResize(w,h); if(typeof w != 'number'){ @@ -260,15 +267,22 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, }, setValue: function(v) // not a valid action - must use addItems.. { - if (typeof(v) != 'object') { - return; - } + + var _this = this; Roo.each(v, function(l) { _this.addItem(l); }); }, + setFromData: function(v) + { + Roo.log(v); + + + }, + + validateValue : function(value){ return Roo.form.ComboBoxArray.superclass.validateValue.call(this, this.getValue());