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

diff --git a/Roo/form/ComboBoxArray.js b/Roo/form/ComboBoxArray.js
index 65dcd827c5..f060e0c2a2 100644
--- a/Roo/form/ComboBoxArray.js
+++ b/Roo/form/ComboBoxArray.js
@@ -185,7 +185,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
         
         return;
         // not sure if this is needed..
-        this.combo.onResize(w,h);
+        //this.combo.onResize(w,h);
         
         if(typeof w != 'number'){
             // we do not handle it!?!?
@@ -252,10 +252,11 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
     
     reset : function()
     {
-        Roo.form.ComboBoxArray.superclass.reset.call(this); 
+        //Roo.form.ComboBoxArray.superclass.reset.call(this); 
         this.items.each(function(f) {
            f.remove(); 
         });
+        this.el.dom.value = '';
         if (this.hiddenEl) {
             this.hiddenEl.dom.value = '';
         }
@@ -268,8 +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) {
+        
+        
+        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;
@@ -286,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);
+             
         }
         
         
@@ -296,10 +305,12 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
     setFromData: function(v)
     {
         // this recieves an object, if setValues is called.
-        Roo.log(v);
+        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++) {