X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fform%2FComboBoxArray.js;h=52ad0397d770136aa8ea505761acdcd4497dc688;hb=77be9a5476e48e25fb3a50192a2b1baa1323a98d;hp=eeef951bb0342f21318ae5b8d532bcddc7d43d0e;hpb=57c45680bcec3818d9cbcd3f422abbe69559f6b2;p=roojs1 diff --git a/Roo/form/ComboBoxArray.js b/Roo/form/ComboBoxArray.js index eeef951bb0..52ad0397d7 100644 --- a/Roo/form/ComboBoxArray.js +++ b/Roo/form/ComboBoxArray.js @@ -73,7 +73,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, */ name : false, /** - * @cfg {String} name The hidden name of the field, often contains an comma seperated list of names + * @cfg {String} hiddenName The hidden name of the field, often contains an comma seperated list of names */ hiddenName : false, @@ -101,6 +101,11 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, this.combo = Roo.factory(this.combo, Roo.form); this.combo.onRender(ct, position); + if (typeof(this.combo.width) != 'undefined') { + this.combo.onResize(this.combo.width,0); + } + + this.combo.initEvents(); // assigned so form know we need to do this.. this.store = this.combo.store; @@ -185,7 +190,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, return; // not sure if this is needed.. - this.combo.onResize(w,h); + //this.combo.onResize(w,h); if(typeof w != 'number'){ // we do not handle it!?!? @@ -211,9 +216,9 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, addItem: function(rec) { - var idField = this.combo.valueField; + var valueField = this.combo.valueField; var displayField = this.combo.displayField; - if (this.items.indexOfKey(rec[idField]) > -1) { + if (this.items.indexOfKey(rec[valueField]) > -1) { //console.log("GOT " + rec.data.id); return; } @@ -221,12 +226,12 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, var x = new Roo.form.ComboBoxArray.Item({ //id : rec[this.idField], data : rec, - nameField : displayField , + displayField : displayField , tipField : displayField , cb : this }); // use the - this.items.add(rec[idField],x); + this.items.add(rec[valueField],x); // add it before the element.. this.updateHiddenEl(); x.render(this.outerWrap, this.wrap.dom); @@ -252,10 +257,11 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, reset : function() { - Roo.form.ComboBoxArray.superclass.reset.call(this); + //Roo.form.ComboBoxArray.superclass.reset.call(this); this.items.each(function(f) { f.remove(); }); + this.el.dom.value = ''; if (this.hiddenEl) { this.hiddenEl.dom.value = ''; } @@ -268,8 +274,11 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, setValue: function(v) // not a valid action - must use addItems.. { + this.reset(); + - if (this.store.isLocal) { + + if (this.store.isLocal && (typeof(v) == 'string')) { // then we can use the store to find the values.. // comma seperated at present.. this needs to allow JSON based encoding.. this.hiddenEl.value = v; @@ -280,15 +289,20 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, if (!li.length) { return; } - add = {}; + var add = {}; add[this.valueField] = k; add[this.displayField] = li.item(0).data[this.displayField]; this.addItem(add); }, this) - - - + + } + if (typeof(v) == 'object') { + // then let's assume it's an array of objects.. + Roo.each(v, function(l) { + this.addItem(l); + }, this); + } @@ -296,8 +310,20 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, setFromData: function(v) { // this recieves an object, if setValues is called. - var keys = v[this.valueField].split(','); - var display = v[this.displayField].split(','); + this.reset(); + this.el.dom.value = v[this.displayField]; + this.hiddenEl.dom.value = v[this.valueField]; + if (typeof(v[this.valueField]) != 'string' || !v[this.valueField].length) { + return; + } + var kv = v[this.valueField]; + var dv = v[this.displayField]; + kv = typeof(kv) != 'string' ? '' : kv; + dv = typeof(dv) != 'string' ? '' : dv; + + + var keys = kv.split(','); + var display = dv.split(','); for (var i = 0 ; i < keys.length; i++) { add = {}; @@ -309,10 +335,71 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, }, + /** + * Validates the combox array value + * @return {Boolean} True if the value is valid, else false + */ + validate : function(){ + if(this.disabled || this.validateValue(this.processValue(this.getValue()))){ + this.clearInvalid(); + return true; + } + return false; + }, validateValue : function(value){ return Roo.form.ComboBoxArray.superclass.validateValue.call(this, this.getValue()); + }, + + /** + * Mark this combo array as invalid + * @param {String} msg The validation message + */ + markInvalid : function(msg){ + if(!this.rendered || this.preventMark){ // not rendered + return; + } + this.combo.el.addClass(this.invalidClass); + msg = msg || this.invalidText; + switch(this.msgTarget){ + case 'qtip': + this.el.dom.qtip = msg; + this.el.dom.qclass = 'x-form-invalid-tip'; + if(Roo.QuickTips){ // fix for floating editors interacting with DND + Roo.QuickTips.enable(); + } + break; + case 'title': + this.el.dom.title = msg; + break; + case 'under': + if(!this.errorEl){ + var elp = this.el.findParent('.x-form-element', 5, true); + this.errorEl = elp.createChild({cls:'x-form-invalid-msg'}); + this.errorEl.setWidth(elp.getWidth(true)-20); + } + this.errorEl.update(msg); + Roo.form.Field.msgFx[this.msgFx].show(this.errorEl, this); + break; + case 'side': + if(!this.errorIcon){ + var elp = this.el.findParent('.x-form-element', 5, true); + this.errorIcon = elp.createChild({cls:'x-form-invalid-icon'}); + } + this.alignErrorIcon(); + this.errorIcon.dom.qtip = msg; + this.errorIcon.dom.qclass = 'x-form-invalid-tip'; + this.errorIcon.show(); + this.on('resize', this.alignErrorIcon, this); + break; + default: + var t = Roo.getDom(this.msgTarget); + t.innerHTML = msg; + t.style.display = this.msgDisplay; + break; + } + this.fireEvent('invalid', this, msg); } }); @@ -338,7 +425,7 @@ Roo.form.ComboBoxArray.Item = function(config) { Roo.extend(Roo.form.ComboBoxArray.Item, Roo.BoxComponent, { data : {}, cb: false, - nameField : false, + displayField : false, tipField : false, @@ -372,7 +459,7 @@ Roo.extend(Roo.form.ComboBoxArray.Item, Roo.BoxComponent, { this.el.child('div').dom.innerHTML = this.cb.renderer ? this.cb.renderer(this.data) : - String.format('{0}',this.data[this.nameField]); + String.format('{0}',this.data[this.displayField]); this.el.child('div').dom.setAttribute('qtip', @@ -392,5 +479,4 @@ Roo.extend(Roo.form.ComboBoxArray.Item, Roo.BoxComponent, { this.cb.updateHiddenEl(); } - }); \ No newline at end of file