Roo/form/ComboBoxArray.js

[roojs1] / Roo / form / ComboBoxArray.js

diff --git a/Roo/form/ComboBoxArray.js b/Roo/form/ComboBoxArray.js
index 0569f25..5e83b79 100644 (file)
--- a/Roo/form/ComboBoxArray.js
+++ b/Roo/form/ComboBoxArray.js
@@ -276,9 +276,8 @@ Roo.extend(Roo.form.ComboBoxArray, Roo.form.TextField,
     reset : function()
     {
         //Roo.form.ComboBoxArray.superclass.reset.call(this); 
-        this.items.each(function(f) {
-           f.remove(); 
-        });
+        this.items.clear();
+        
         this.el.dom.value = '';
         if (this.hiddenEl) {
             this.hiddenEl.dom.value = '';
@@ -469,11 +468,14 @@ Roo.extend(Roo.form.ComboBoxArray.Item, Roo.BoxComponent, {
             return;
         }
         
-        this.cb.items.remove(this);
-        this.el.child('img').un('click', this.remove, this);
-        this.el.remove();
-        this.cb.updateHiddenEl();
+        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);
+        }
         
-        this.cb.fireEvent('remove', this.cb, this);
     }
 });
\ No newline at end of file