From: Alan Knowles <alan@roojs.com>
Date: Thu, 5 Jul 2012 03:47:58 +0000 (+0800)
Subject: roojs-debug.js
X-Git-Url: http://git.roojs.org/?a=commitdiff_plain;h=50f3ab69e3d05b5839225fedfc7e1d7a59e3f0ec;hp=3bc8964e3f0d243cf5a2a3bb71e60945ac2800c7;p=roojs1

roojs-debug.js
---

diff --git a/roojs-debug.js b/roojs-debug.js
index bbe06a89ea..aa68db2320 100644
--- a/roojs-debug.js
+++ b/roojs-debug.js
@@ -38739,8 +38739,10 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
     {
          
         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;
@@ -38761,6 +38763,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);
+            }, this);
+             
+        }
         
         
     },