X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fform%2FComboBoxArray.js;h=9534e3e208a25bd5f1c46db73482dea7e43e92b5;hb=a93261d972466d13c76cbb129c00d02973668013;hp=fd2acd030239b412185656c4a9ad260a598bf28d;hpb=535444259812f998bf5d81f5936ec8ab9ea7f8fc;p=roojs1

diff --git a/Roo/form/ComboBoxArray.js b/Roo/form/ComboBoxArray.js
index fd2acd0302..9534e3e208 100644
--- a/Roo/form/ComboBoxArray.js
+++ b/Roo/form/ComboBoxArray.js
@@ -308,7 +308,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
             }, this) 
              
         }
-        if (typeof(v) == 'string' ) {
+        if (typeof(v) == 'object' ) {
             // then let's assume it's an array of objects..
             Roo.each(v, function(l) {
                 this.addItem(l);
@@ -452,6 +452,10 @@ Roo.extend(Roo.form.ComboBoxArray.Item, Roo.BoxComponent, {
                         String.format('{0}',this.data[this.tipField])
         );
         
+        if(this.cb.disabled){
+            return;
+        }
+
         this.el.child('img').on('click', this.remove, this);
         
     },