Roo/bootstrap/CheckBox.js

[roojs1] / Roo / bootstrap / CheckBox.js

diff --git a/Roo/bootstrap/CheckBox.js b/Roo/bootstrap/CheckBox.js
index d14bb97..0e02ec0 100644 (file)
--- a/Roo/bootstrap/CheckBox.js
+++ b/Roo/bootstrap/CheckBox.js
@@ -491,12 +491,13 @@ Roo.extend(Roo.bootstrap.CheckBox, Roo.bootstrap.Input,  {
 
         if(this.inputType == 'radio'){
             Roo.each(this.el.up('form').select('input[name='+this.name+']', true).elements, function(e){
+                var fg = e.findParent('.form-group', false, true);
                 if (Roo.bootstrap.version == 3) {
-                    e.findParent('.form-group', false, true).removeClass([_this.invalidClass, _this.validClass]);
-                    e.findParent('.form-group', false, true).addClass(_this.validClass);
+                    fg.removeClass([_this.invalidClass, _this.validClass]);
+                    fg.addClass(_this.validClass);
                 } else {
-                    e.findParent('.form-group', false, true).removeClass(['is-valid', 'is-invalid']);
-                    e.findParent('.form-group', false, true).addClass('is-valid');
+                    fg.removeClass(['is-valid', 'is-invalid']);
+                    fg.addClass('is-valid');
                 }
             });
             
@@ -504,12 +505,13 @@ Roo.extend(Roo.bootstrap.CheckBox, Roo.bootstrap.Input,  {
         }
 
         if(!this.groupId){
+            var fg = this.el.findParent('.form-group', false, true);
             if (Roo.bootstrap.version == 3) {
-                this.el.findParent('.form-group', false, true).removeClass([this.invalidClass, this.validClass]);
-                this.el.findParent('.form-group', false, true).addClass(this.validClass);
+                fg.removeClass([this.invalidClass, this.validClass]);
+                fg.addClass(this.validClass);
             } else {
-                this.el.findParent('.form-group', false, true).removeClass(['is-valid', 'is-invalid']);
-                this.el.findParent('.form-group', false, true).addClass('is-valid');
+                fg.removeClass(['is-valid', 'is-invalid']);
+                fg.addClass('is-valid');
             }
             return;
         }
@@ -521,8 +523,14 @@ Roo.extend(Roo.bootstrap.CheckBox, Roo.bootstrap.Input,  {
         }
         
         for(var i in group){
-            group[i].el.findParent('.form-group', false, true).removeClass([this.invalidClass, this.validClass]);
-            group[i].el.findParent('.form-group', false, true).addClass(this.validClass);
+            var fg = group[i].el.findParent('.form-group', false, true);
+            if (Roo.bootstrap.version == 3) {
+                fg.removeClass([this.invalidClass, this.validClass]);
+                fg.addClass(this.validClass);
+            } else {
+                fg.removeClass(['is-valid', 'is-invalid']);
+                fg.addClass('is-valid');
+            }
         }
     },
     
@@ -562,16 +570,19 @@ Roo.extend(Roo.bootstrap.CheckBox, Roo.bootstrap.Input,  {
                     fg.addClass('is-invalid');
                 }
             });
-            } else {
-                
-            }
             
             return;
         }
         
         if(!this.groupId){
-            this.el.findParent('.form-group', false, true).removeClass([this.invalidClass, this.validClass]);
-            this.el.findParent('.form-group', false, true).addClass(this.invalidClass);
+            var fg = this.el.findParent('.form-group', false, true);
+            if (Roo.bootstrap.version == 3) {
+                fg.removeClass([_this.invalidClass, _this.validClass]);
+                fg.addClass(_this.invalidClass);
+            } else {
+                fg.removeClass(['is-invalid', 'is-valid']);
+                fg.addClass('is-invalid');
+            }
             return;
         }
         
@@ -582,8 +593,14 @@ Roo.extend(Roo.bootstrap.CheckBox, Roo.bootstrap.Input,  {
         }
         
         for(var i in group){
-            group[i].el.findParent('.form-group', false, true).removeClass([this.invalidClass, this.validClass]);
-            group[i].el.findParent('.form-group', false, true).addClass(this.invalidClass);
+            var fg = group[i].el.findParent('.form-group', false, true);
+            if (Roo.bootstrap.version == 3) {
+                fg.removeClass([_this.invalidClass, _this.validClass]);
+                fg.addClass(_this.invalidClass);
+            } else {
+                fg.removeClass(['is-invalid', 'is-valid']);
+                fg.addClass('is-invalid');
+            }
         }
         
     },
@@ -597,8 +614,8 @@ Roo.extend(Roo.bootstrap.CheckBox, Roo.bootstrap.Input,  {
         var label = Roo.bootstrap.FieldLabel.get(this.name + '-group');
         
         if (label && label.iconEl) {
-            label.iconEl.removeClass(label.validClass);
-            label.iconEl.removeClass(label.invalidClass);
+            label.iconEl.removeClass([ label.validClass, label.invalidClass ]);
+            
         }
     },