X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fform%2FComboBoxArray.js;h=47d9cafa9867a8e69d558731c6cc474994a5f657;hb=2193646ae7828101118318d7a3f580255b7b1c7b;hp=74a02899fb207182ec6ec387890eaa4b9ec4c9bb;hpb=4c028cc735ffaaa41aeaf05ea70dc4810513397d;p=roojs1

diff --git a/Roo/form/ComboBoxArray.js b/Roo/form/ComboBoxArray.js
index 74a02899fb..47d9cafa98 100644
--- a/Roo/form/ComboBoxArray.js
+++ b/Roo/form/ComboBoxArray.js
@@ -37,10 +37,18 @@
 Roo.form.ComboBoxArray = function(config)
 {
     this.addEvents({
+        /**
+         * @event beforeremove
+         * Fires before remove the value from the list
+	     * @param {Roo.form.ComboBoxArray} _self This combo box array
+             * @param {Roo.form.ComboBoxArray.Item} item removed item
+	     */
+        'beforeremove' : true,
         /**
          * @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
         
@@ -269,6 +277,7 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
     {
         //Roo.form.ComboBoxArray.superclass.reset.call(this); 
         this.items.each(function(f) {
+            Roo.log(f);
            f.remove(); 
         });
         this.el.dom.value = '';
@@ -286,8 +295,6 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
          
         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..
@@ -307,7 +314,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);
@@ -457,13 +464,18 @@ Roo.extend(Roo.form.ComboBoxArray.Item, Roo.BoxComponent, {
    
     remove : function()
     {
-        Roo.log(this);
-        this.cb.items.remove(this);
-        this.el.child('img').un('click', this.remove, this);
-        this.el.remove();
-        this.cb.updateHiddenEl();
-        
-        Roo.log('remove?????');
-        this.cb.fireEvent('remove', this.cb, this);
+        if(this.cb.disabled){
+            return;
+        }
+        
+        if(false !== this.cb.fireEvent('beforeremove', this.cb, this)){
+            this.cb.items.remove(this);
+            this.el.child('img').un('click', this.remove, this);
+            this.el.remove();
+            this.cb.updateHiddenEl();
+
+            this.cb.fireEvent('remove', this.cb, this);
+        }
+        
     }
 });
\ No newline at end of file