Roo/form/ComboBoxArray.js

[roojs1] / Roo / form / Checkbox.js

diff --git a/Roo/form/Checkbox.js b/Roo/form/Checkbox.js
index da29e91..85903b8 100644 (file)
--- a/Roo/form/Checkbox.js
+++ b/Roo/form/Checkbox.js
@@ -146,6 +146,9 @@ Roo.extend(Roo.form.Checkbox, Roo.form.Field,  {
 
        // private
     onClick : function(){ 
+        if (this.disabled) {
+            return;
+        }
         this.setChecked(!this.checked);
 
         //if(this.el.dom.checked != this.checked){
@@ -155,7 +158,9 @@ Roo.extend(Roo.form.Checkbox, Roo.form.Field,  {
 
     /**
      * Sets the checked state of the checkbox.
-     * @param {Boolean/String} checked True, 'true', '1', or 'on' to check the checkbox, any other value will uncheck it.
+     * On is always based on a string comparison between inputValue and the param.
+     * @param {Boolean/String} value - the value to set 
+     * @param {Boolean/String} suppressEvent - whether to suppress the checkchange event.
      */
     setValue : function(v,suppressEvent){
         
@@ -165,7 +170,7 @@ Roo.extend(Roo.form.Checkbox, Roo.form.Field,  {
         //    this.el.dom.checked = this.checked;
         //    this.el.dom.defaultChecked = this.checked;
         //}
-        this.setChecked(String(v) === String(this.inputValue));
+        this.setChecked(String(v) === String(this.inputValue), suppressEvent);
         //this.fireEvent("check", this, this.checked);
     },
     // private..
@@ -182,7 +187,7 @@ Roo.extend(Roo.form.Checkbox, Roo.form.Field,  {
         }
         this.checked = state;
         if(suppressEvent !== true){
-            this.fireEvent('checkchange', this, state);
+            this.fireEvent('check', this, state);
         }
         this.inSetChecked = true;
         this.el.dom.value = state ? this.inputValue : this.valueOff;