X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fform%2FComboBoxArray.js;h=2894623f6b6f54f02c01bbdf1701e73dd9a12ccc;hb=55406c28f2ed5bec56435eefd624d2404d983d40;hp=b0a8fd7e4f8f9d328495182a50154e301876715e;hpb=ddba099d271a4a2896102530daac6e7aafb1eeae;p=roojs1 diff --git a/Roo/form/ComboBoxArray.js b/Roo/form/ComboBoxArray.js index b0a8fd7e4f..2894623f6b 100644 --- a/Roo/form/ComboBoxArray.js +++ b/Roo/form/ComboBoxArray.js @@ -101,6 +101,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, this.combo = Roo.factory(this.combo, Roo.form); this.combo.onRender(ct, position); + this.combo.initEvents(); // assigned so form know we need to do this.. this.store = this.combo.store; @@ -290,9 +291,14 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, 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); + } @@ -306,8 +312,14 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField, if (typeof(v[this.valueField]) != 'string' || !v[this.valueField].length) { return; } - var keys = v[this.valueField].split(','); - var display = v[this.displayField].split(','); + 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 = {}; @@ -354,7 +366,7 @@ Roo.extend(Roo.form.ComboBoxArray.Item, Roo.BoxComponent, { defaultAutoCreate : { tag: 'div', - cls: 'x-cbarray-item', + cls: 'x-cbarray-item-t', cn : [ { tag: 'div' }, {