X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fform%2FComboBoxArray.js;h=9534e3e208a25bd5f1c46db73482dea7e43e92b5;hb=a93261d972466d13c76cbb129c00d02973668013;hp=9eb133708a3ca25d4e31cf663a0002ecb4ed524c;hpb=e13917464a94748d2f2b163cdaaa7d387ceea2c8;p=roojs1 diff --git a/Roo/form/ComboBoxArray.js b/Roo/form/ComboBoxArray.js index 9eb133708a..9534e3e208 100644 --- a/Roo/form/ComboBoxArray.js +++ b/Roo/form/ComboBoxArray.js @@ -36,6 +36,17 @@ Roo.form.ComboBoxArray = function(config) { + this.addEvents({ + /** + * @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 +308,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); @@ -350,6 +361,31 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, validateValue : function(value){ return Roo.form.ComboBoxArray.superclass.validateValue.call(this, this.getValue()); + }, + + /*@ + * overide + * + */ + isDirty : function() { + if(this.disabled) { + return false; + } + + 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]); + } + + return String(this.getValue()) !== String(originalValue.join(',')); + } }); @@ -416,17 +452,21 @@ Roo.extend(Roo.form.ComboBoxArray.Item, Roo.BoxComponent, { String.format('{0}',this.data[this.tipField]) ); + if(this.cb.disabled){ + return; + } + this.el.child('img').on('click', this.remove, this); }, remove : function() { - 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); } - }); \ No newline at end of file