allow string based values for comboboxarray

[roojs1] / Roo / form / ComboCheck.js

diff --git a/Roo/form/ComboCheck.js b/Roo/form/ComboCheck.js
index 756ed6f..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,27 +87,66 @@ Roo.extend(Roo.form.ComboCheck, Roo.form.ComboBox, {
         
     },
     select: function () {
+        //Roo.log("SELECT CALLED");
+    },
+     
+    selectByValue : function(xv, scrollIntoView){
+        var ar = this.getValueArray();
+        var sels = [];
         
+        Roo.each(ar, function(v) {
+            if(v === undefined || v === null){
+                return;
+            }
+            var r = this.findRecord(this.valueField, v);
+            if(r){
+                sels.push(this.store.indexOf(r))
+                
+            }
+        },this);
+        this.view.select(sels);
+        return false;
     },
     
+    
+    
     onSelect : function(record, index){
+       // 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 {
-            var ret = Roo.decode(thist.value);
-            ret = typeof(ar) == 'Array' ? ar : []; //?? valid?
-            return ret;
+            //Roo.log(this.value);
+            if (typeof(this.value) == 'undefined') {
+                return [];
+            }
+            var ar = Roo.decode(this.value);
+            return  ar instanceof Array ? ar : []; //?? valid?
+            
         } catch(e) {
-            Roo.log("Roo.form.ComboCheck:getValueArray  invalid data:" + this.getValue());
+            Roo.log(e + "\nRoo.form.ComboCheck:getValueArray  invalid data:" + this.getValue());
             return [];
         }
          
     },
-    
+    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);
@@ -116,36 +158,35 @@ Roo.extend(Roo.form.ComboCheck, Roo.form.ComboBox, {
         Roo.each(sl, function(i) {
             r = st.getAt(i);
             nv.push(r.get(this.valueField));
-            tv.push(r.get(this.displayField));
         },this);
+        this.setValue(Roo.encode(nv));
+        if (this.value != this.valueBefore) {
+
+            this.fireEvent('change', this, this.value, this.valueBefore);
+            this.valueBefore = this.value;
+        }
         
-        this.hiddenField.value = Roo.encode(nv);
-        
-        Roo.form.ComboBox.superclass.setValue.call(this, tv.join(', '));
-        this.value = this.hiddenField.value;
     },
     
     setValue : function(v){
-        Roo.log(v);
+        // Roo.log(v);
         this.value = v;
         
-        
-        
-        var text = v;
-        if(this.valueField){
-            var r = this.findRecord(this.valueField, v);
+        var vals = this.getValueArray();
+        var tv = [];
+        Roo.each(vals, function(k) {
+            var r = this.findRecord(this.valueField, k);
             if(r){
-                text = r.data[this.displayField];
+                tv.push(r.data[this.displayField]);
             }else if(this.valueNotFoundText !== undefined){
-                text = this.valueNotFoundText;
+                tv.push( this.valueNotFoundText );
             }
-        }
-        this.lastSelectionText = text;
-        if(this.hiddenField){
-            this.hiddenField.value = v;
-        }
-        Roo.form.ComboBox.superclass.setValue.call(this, text);
+        },this);
+       // Roo.log(tv);
+        
+        Roo.form.ComboBox.superclass.setValue.call(this, tv.join(', '));
+        this.hiddenField.value = v;
         this.value = v;
-    },)
+    }
     
 });
\ No newline at end of file