X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fform%2FComboBoxArray.js;h=f060e0c2a276e0558cdf7d30d0e57b02859b2229;hb=49e5aba4b8219173cd600311208a3097bdfcc409;hp=8a0a6af790aa7b504029df2b03862b1e07defe33;hpb=2ed8434c973af2682c0628c2fcf1ec39024af9e7;p=roojs1

diff --git a/Roo/form/ComboBoxArray.js b/Roo/form/ComboBoxArray.js
index 8a0a6af790..f060e0c2a2 100644
--- a/Roo/form/ComboBoxArray.js
+++ b/Roo/form/ComboBoxArray.js
@@ -256,6 +256,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
         this.items.each(function(f) {
            f.remove(); 
         });
+        this.el.dom.value = '';
         if (this.hiddenEl) {
             this.hiddenEl.dom.value = '';
         }
@@ -268,9 +269,11 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
     setValue: function(v) // not a valid action - must use addItems..
     {
          
-       this.reset();
-
-        if (this.store.isLocal) {
+        this.reset();
+        
+        
+        
+        if (this.store.isLocal && (typeof(v) == 'string')) {
             // then we can use the store to find the values..
             // comma seperated at present.. this needs to allow JSON based encoding..
             this.hiddenEl.value  = v;
@@ -287,9 +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);
+             
         }
         
         
@@ -300,7 +308,9 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
         this.reset();
         this.el.dom.value = v[this.displayField];
         this.hiddenEl.dom.value = v[this.valueField];
-        
+        if (typeof(v[this.valueField]) != 'string' || !v[this.valueField].length) {
+            return;
+        }
         var keys = v[this.valueField].split(',');
         var display = v[this.displayField].split(',');
         for (var i = 0 ; i < keys.length; i++) {