X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=roojs-ui-debug.js;h=009b1c404dee46eaad98e790aca1954496e88375;hb=5aa66277597eebf9091d0a12a91917bad8644d6c;hp=b4b532f2a5ed1c53fcf8e3be17fde2e16f9cec83;hpb=5b1a708cf006e24f8f6eb81a4e9723dad77c31cd;p=roojs1 diff --git a/roojs-ui-debug.js b/roojs-ui-debug.js index b4b532f2a5..009b1c404d 100644 --- a/roojs-ui-debug.js +++ b/roojs-ui-debug.js @@ -19833,7 +19833,10 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, * @cfg {String} hiddenName The hidden name of the field, often contains an comma seperated list of names */ hiddenName : false, - + /** + * @cfg {String} seperator The value seperator normally ',' + */ + seperator : ',', // private the array of items that are displayed.. items : false, @@ -20008,7 +20011,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, this.items.each(function(f) { ar.push(f.data[idField]); }); - this.hiddenEl.dom.value = ar.join(','); + this.hiddenEl.dom.value = ar.join(this.seperator); this.validate(); }, @@ -20040,7 +20043,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, // comma seperated at present.. this needs to allow JSON based encoding.. this.hiddenEl.value = v; var v_ar = []; - Roo.each(v.split(','), function(k) { + Roo.each(v.split(this.seperator), function(k) { Roo.log("CHECK " + this.valueField + ',' + k); var li = this.store.query(this.valueField, k); if (!li.length) { @@ -20057,7 +20060,13 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, if (typeof(v) == 'object' ) { // then let's assume it's an array of objects.. Roo.each(v, function(l) { - this.addItem(l); + var add = l; + if (typeof(l) == 'string') { + add = {}; + add[this.valueField] = l; + add[this.displayField] = l + } + this.addItem(add); }, this); } @@ -20079,10 +20088,9 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, dv = typeof(dv) != 'string' ? '' : dv; - var keys = kv.split(','); - var display = dv.split(','); + var keys = kv.split(this.seperator); + var display = dv.split(this.seperator); for (var i = 0 ; i < keys.length; i++) { - add = {}; add[this.valueField] = keys[i]; add[this.displayField] = display[i]; @@ -20130,7 +20138,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, originalValue.push(d[i][this.valueField]); } - return String(this.getValue()) !== String(originalValue.join(',')); + return String(this.getValue()) !== String(originalValue.join(this.seperator)); }