Roo/form/ComboBoxArray.js

[roojs1] / Roo / form / ComboCheck.js

diff --git a/Roo/form/ComboCheck.js b/Roo/form/ComboCheck.js
index 899eafe..a6b8aeb 100644 (file)
--- a/Roo/form/ComboCheck.js
+++ b/Roo/form/ComboCheck.js
@@ -10,6 +10,9 @@
  * @class Roo.form.ComboCheck
  * @extends Roo.form.ComboBox
  * A combobox for multiple select items.
+ *
+ * FIXME - could do with a reset button..
+ * 
  * @constructor
  * Create a new ComboCheck
  * @param {Object} config Configuration options
@@ -27,9 +30,9 @@ Roo.form.ComboCheck = function(config){
         if ((typeof(_t[e]) == 'undefined' ) || !_t[e].length) {
             throw "Roo.form.ComboCheck : missing value for: " + e;
         }
-    })
+    });
+    
     
-   
 };
 
 Roo.extend(Roo.form.ComboCheck, Roo.form.ComboBox, {
@@ -84,29 +87,9 @@ Roo.extend(Roo.form.ComboCheck, Roo.form.ComboBox, {
         
     },
     select: function () {
-        Roo.log("SELECT CALLED");
+        //Roo.log("SELECT CALLED");
     },
-    /*
-    onLoad: function() {
-        if(!this.hasFocus){
-            return;
-        }
-        if(!this.store.getCount()){
-            this.onEmptyResults();
-            return;
-        }
-        this.expand();
-        this.restrictHeight();
-        // 
-        
-        if(!this.selectByValue(this.value, true)){
-            this.select(0, true);
-        }
      
-        
-        
-    },
-    */
     selectByValue : function(xv, scrollIntoView){
         var ar = this.getValueArray();
         var sels = [];
@@ -128,14 +111,24 @@ Roo.extend(Roo.form.ComboCheck, Roo.form.ComboBox, {
     
     
     onSelect : function(record, index){
-        Roo.log("onselect Called");
+       // Roo.log("onselect Called");
        // this is only called by the clear button now..
-       this.view.clearSelections();
+        this.view.clearSelections();
+        this.setValue('[]');
+        if (this.value != this.valueBefore) {
+            this.fireEvent('change', this, this.value, this.valueBefore);
+            this.valueBefore = this.value;
+        }
     },
     getValueArray : function()
     {
         var ar = [] ;
+        
         try {
+            //Roo.log(this.value);
+            if (typeof(this.value) == 'undefined') {
+                return [];
+            }
             var ar = Roo.decode(this.value);
             return  ar instanceof Array ? ar : []; //?? valid?
             
@@ -145,7 +138,15 @@ Roo.extend(Roo.form.ComboCheck, Roo.form.ComboBox, {
         }
          
     },
-    
+    expand : function ()
+    {
+        
+        Roo.form.ComboCheck.superclass.expand.call(this);
+        this.valueBefore = typeof(this.value) == 'undefined' ? '' : this.value;
+        //this.valueBefore = typeof(this.valueBefore) == 'undefined' ? '' : this.valueBefore;
+        
+
+    },
     
     collapse : function(){
         Roo.form.ComboCheck.superclass.collapse.call(this);
@@ -158,7 +159,12 @@ Roo.extend(Roo.form.ComboCheck, Roo.form.ComboBox, {
             r = st.getAt(i);
             nv.push(r.get(this.valueField));
         },this);
-        this.setValue(Roo.encode(nv))
+        this.setValue(Roo.encode(nv));
+        if (this.value != this.valueBefore) {
+
+            this.fireEvent('change', this, this.value, this.valueBefore);
+            this.valueBefore = this.value;
+        }
         
     },