X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=roojs-debug.js;h=adcff90e77859af4ce9e031bfc2fc7b3509fe970;hp=1cda431fb38d359f9d8f612814b13f88fd44ef92;hb=0b69a11b1055a6d3a3fd0719bdd58b5a235de0e4;hpb=5b1a708cf006e24f8f6eb81a4e9723dad77c31cd diff --git a/roojs-debug.js b/roojs-debug.js index 1cda431fb3..adcff90e77 100644 --- a/roojs-debug.js +++ b/roojs-debug.js @@ -42318,7 +42318,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, @@ -42493,7 +42496,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(); }, @@ -42525,7 +42528,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) { @@ -42542,7 +42545,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); } @@ -42564,10 +42573,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]; @@ -42615,7 +42623,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)); }