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

diff --git a/Roo/form/ComboBoxArray.js b/Roo/form/ComboBoxArray.js
index 4f7f459f44..9534e3e208 100644
--- a/Roo/form/ComboBoxArray.js
+++ b/Roo/form/ComboBoxArray.js
@@ -40,7 +40,8 @@ Roo.form.ComboBoxArray = function(config)
         /**
          * @event remove
          * Fires when remove the value from the list
-	     * @param {Roo.form.ComboBox} combo This combo box
+	     * @param {Roo.form.ComboBoxArray} _self This combo box array
+             * @param {Roo.form.ComboBoxArray.Item} item removed item
 	     */
         'remove' : true
         
@@ -307,7 +308,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
             }, this) 
              
         }
-        if (typeof(v) == 'object') {
+        if (typeof(v) == 'object' ) {
             // then let's assume it's an array of objects..
             Roo.each(v, function(l) {
                 this.addItem(l);
@@ -451,19 +452,21 @@ 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);
         
     },
    
     remove : function()
     {
-        
         this.cb.items.remove(this);
         this.el.child('img').un('click', this.remove, this);
         this.el.remove();
         this.cb.updateHiddenEl();
         
-        Roo.log('remove?????');
-        this.fireEvent('remove', this);
+        this.cb.fireEvent('remove', this.cb, this);
     }
 });
\ No newline at end of file