X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=docs%2Fsymbols%2Fsrc%2FRoo_bootstrap_CheckBox.js.html;h=34ff4737838edea9eab35a0ab94713144728d422;hb=c1081f6f4b74fed0a601b8fa1f97a3c6372cb36b;hp=87585c69537022d667c68d55b49221d5fc4b44df;hpb=3ce24a55f7fd794ff1b2b0cc999eba892abe50ad;p=roojs1 diff --git a/docs/symbols/src/Roo_bootstrap_CheckBox.js.html b/docs/symbols/src/Roo_bootstrap_CheckBox.js.html index 87585c6953..34ff473783 100644 --- a/docs/symbols/src/Roo_bootstrap_CheckBox.js.html +++ b/docs/symbols/src/Roo_bootstrap_CheckBox.js.html @@ -153,23 +153,50 @@ if (align ==='left' && this.fieldLabel.length) { // Roo.log("left and has label"); - cfg.cn = [ - - { - tag: 'label', - 'for' : id, - cls : 'control-label col-md-' + this.labelWidth, - html : this.fieldLabel - - }, - { - cls : "col-md-" + (12 - this.labelWidth), - cn: [ - inputblock - ] - } - - ]; + cfg.cn = [ + { + tag: 'label', + 'for' : id, + cls : 'control-label', + html : this.fieldLabel + + }, + { + cls : "", + cn: [ + inputblock + ] + } + ]; + + if(this.labelWidth > 12){ + cfg.cn[0].style = "width: " + this.labelWidth + 'px'; + } + + if(this.labelWidth < 13 && this.labelmd == 0){ + this.labelmd = this.labelWidth; + } + + if(this.labellg > 0){ + cfg.cn[0].cls += ' col-lg-' + this.labellg; + cfg.cn[1].cls += ' col-lg-' + (12 - this.labellg); + } + + if(this.labelmd > 0){ + cfg.cn[0].cls += ' col-md-' + this.labelmd; + cfg.cn[1].cls += ' col-md-' + (12 - this.labelmd); + } + + if(this.labelsm > 0){ + cfg.cn[0].cls += ' col-sm-' + this.labelsm; + cfg.cn[1].cls += ' col-sm-' + (12 - this.labelsm); + } + + if(this.labelxs > 0){ + cfg.cn[0].cls += ' col-xs-' + this.labelxs; + cfg.cn[1].cls += ' col-xs-' + (12 - this.labelxs); + } + } else if ( this.fieldLabel.length) { // Roo.log(" label"); cfg.cn = [ @@ -397,7 +424,8 @@ { if(!this.groupId){ return (this.getValue() == this.inputValue || this.allowBlank) ? true : false; - } + //return (this.getValue() == this.inputValue) ? true : false; + } var group = Roo.bootstrap.CheckBox.get(this.groupId); @@ -445,7 +473,7 @@ 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.validClass); @@ -453,7 +481,7 @@ } var group = Roo.bootstrap.CheckBox.get(this.groupId); - + if(!group){ return; } @@ -520,6 +548,8 @@ { Roo.bootstrap.Input.prototype.clearInvalid.call(this); + // this.el.findParent('.form-group', false, true).removeClass([this.invalidClass, this.validClass]); + var label = Roo.bootstrap.FieldLabel.get(this.name + '-group'); if (label) {