allow string based values for comboboxarray

[roojs1] / Roo / form / ComboCheck.js

diff --git a/Roo/form/ComboCheck.js b/Roo/form/ComboCheck.js
index 3316fd1..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
@@ -84,7 +87,7 @@ Roo.extend(Roo.form.ComboCheck, Roo.form.ComboBox, {
         
     },
     select: function () {
-        Roo.log("SELECT CALLED");
+        //Roo.log("SELECT CALLED");
     },
      
     selectByValue : function(xv, scrollIntoView){
@@ -108,16 +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);
+            //Roo.log(this.value);
+            if (typeof(this.value) == 'undefined') {
+                return [];
+            }
             var ar = Roo.decode(this.value);
             return  ar instanceof Array ? ar : []; //?? valid?
             
@@ -129,8 +140,10 @@ Roo.extend(Roo.form.ComboCheck, Roo.form.ComboBox, {
     },
     expand : function ()
     {
+        
         Roo.form.ComboCheck.superclass.expand.call(this);
-        this.valueBefore = this.value;
+        this.valueBefore = typeof(this.value) == 'undefined' ? '' : this.value;
+        //this.valueBefore = typeof(this.valueBefore) == 'undefined' ? '' : this.valueBefore;
         
 
     },
@@ -146,10 +159,11 @@ 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;
         }
         
     },