X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fform%2FComboBoxArray.js;h=530279c2942e25a3e1b1cda5d3b4d03e0a26d908;hb=23efba8e006290e73e13578aa736fb8cccc2df6e;hp=52ad0397d770136aa8ea505761acdcd4497dc688;hpb=77be9a5476e48e25fb3a50192a2b1baa1323a98d;p=roojs1 diff --git a/Roo/form/ComboBoxArray.js b/Roo/form/ComboBoxArray.js index 52ad0397d7..530279c294 100644 --- a/Roo/form/ComboBoxArray.js +++ b/Roo/form/ComboBoxArray.js @@ -36,6 +36,24 @@ Roo.form.ComboBoxArray = function(config) { + this.addEvents({ + /** + * @event beforeremove + * Fires before remove the value from the list + * @param {Roo.form.ComboBoxArray} _self This combo box array + * @param {Roo.form.ComboBoxArray.Item} item removed item + */ + 'beforeremove' : true, + /** + * @event remove + * Fires when remove the value from the list + * @param {Roo.form.ComboBoxArray} _self This combo box array + * @param {Roo.form.ComboBoxArray.Item} item removed item + */ + 'remove' : true + + + }); Roo.form.ComboBoxArray.superclass.constructor.call(this, config); @@ -297,7 +315,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, }, this) } - if (typeof(v) == 'object') { + if (typeof(v) == 'object' ) { // then let's assume it's an array of objects.. Roo.each(v, function(l) { this.addItem(l); @@ -352,54 +370,29 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, }, - /** - * Mark this combo array as invalid - * @param {String} msg The validation message + /*@ + * overide + * */ - markInvalid : function(msg){ - if(!this.rendered || this.preventMark){ // not rendered - return; + isDirty : function() { + if(this.disabled) { + return false; } - 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; + + try { + var d = Roo.decode(String(this.originalValue)); + } catch (e) { + return String(this.getValue()) !== String(this.originalValue); + } + + var originalValue = []; + + for (var i = 0; i < d.length; i++){ + originalValue.push(d[i][this.valueField]); } - this.fireEvent('invalid', this, msg); + + return String(this.getValue()) !== String(originalValue.join(',')); + } }); @@ -472,11 +465,18 @@ Roo.extend(Roo.form.ComboBoxArray.Item, Roo.BoxComponent, { remove : function() { + if(this.cb.disabled){ + return; + } + + if(false !== this.cb.fireEvent('beforeremove', this.cb, this)){ + this.cb.items.remove(this); + this.el.child('img').un('click', this.remove, this); + this.el.remove(); + this.cb.updateHiddenEl(); + + this.cb.fireEvent('remove', this.cb, this); + } - this.cb.items.remove(this); - this.el.child('img').un('click', this.remove, this); - this.el.remove(); - this.cb.updateHiddenEl(); } - }); \ No newline at end of file