X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fform%2FComboBoxArray.js;h=d880af1965df5d6ec37323bfb56569d7a4b131c9;hb=5c4d7caacef2609e2d968788a80290d0a8eff54f;hp=dca5adc40cef897a84f393f2e1fe65f64333ff65;hpb=9c39d4a5545b3f10e7af7518f3d078129ba28848;p=roojs1 diff --git a/Roo/form/ComboBoxArray.js b/Roo/form/ComboBoxArray.js index dca5adc40c..d880af1965 100644 --- a/Roo/form/ComboBoxArray.js +++ b/Roo/form/ComboBoxArray.js @@ -290,17 +290,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); - - + } @@ -314,8 +311,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 = {};