Browse Source

#22: Support form that labels are placed in small (col-sm-), medium (col-md-) elements

nghuuphuoc 12 years ago
parent
commit
469d79ea9e

+ 5 - 4
CHANGELOG.md

@@ -1,20 +1,21 @@
 # Change Log
 
-__v0.2.0__
+v0.2.0
 * Add custom submit handler (using ```submitHandler``` option)
 * Add ```callback``` validator
 * Add ```creditCard``` validator
 * Add ```different``` validator
-* #25: The ```regexp``` validator does not work
 * Add ```live``` option
+* #22: Support form that labels are placed in small (col-sm-), medium (col-md-) elements
+* #25: The ```regexp``` validator does not work
 
-__v0.1.1 (2013-10-17)__
+v0.1.1 (2013-10-17)
 * Add ```submitButtons``` option
 * #16: Disable client side validation in HTML 5
 * #17: Support default Bootstrap form without labels
 * #19: Support select box validator
 
-__v0.1.0 (2013-10-14)__
+v0.1.0 (2013-10-14)
 * First release
 * Provide various validators
     - between

+ 1 - 1
demo/index.html

@@ -22,7 +22,7 @@
 
                     <form id="defaultForm" method="post" class="form-horizontal">
                         <div class="form-group">
-                            <label class="col-m col-lg-3 control-label">Username</label>
+                            <label class="col-lg-3 control-label">Username</label>
                             <div class="col-lg-5">
                                 <input type="text" class="form-control" name="username" />
                             </div>

+ 1 - 1
demo/submitHandler.html

@@ -24,7 +24,7 @@
                     <div class="alert alert-success" style="display: none;"></div>
 
                     <div class="form-group">
-                        <label class="col-m col-lg-3 control-label">Username</label>
+                        <label class="col-lg-3 control-label">Username</label>
                         <div class="col-lg-5">
                             <input type="text" class="form-control" name="username" />
                         </div>

+ 2 - 2
dist/js/bootstrapValidator.js

@@ -164,7 +164,7 @@
                 if (label = $parent.find('label').get(0)) {
                     cssClasses = $(label).attr('class').split(' ');
                     for (var i = 0; i < cssClasses.length; i++) {
-                        if (cssClasses[i].substr(0, 7) == 'col-lg-') {
+                        if (/^col-(sm|md|lg)-\d+$/.test(cssClasses[i])) {
                             offset = cssClasses[i].substr(7);
                             break;
                         }
@@ -172,7 +172,7 @@
                 } else {
                     cssClasses = $parent.children().eq(0).attr('class').split(' ');
                     for (var i = 0; i < cssClasses.length; i++) {
-                        if (cssClasses[i].substr(0, 14) == 'col-lg-offset-') {
+                        if (/^col-(sm|md|lg)-offset-\d+$/.test(cssClasses[i])) {
                             offset = cssClasses[i].substr(14);
                             break;
                         }

File diff suppressed because it is too large
+ 1 - 1
dist/js/bootstrapValidator.min.js


+ 2 - 2
src/js/bootstrapValidator.js

@@ -164,7 +164,7 @@
                 if (label = $parent.find('label').get(0)) {
                     cssClasses = $(label).attr('class').split(' ');
                     for (var i = 0; i < cssClasses.length; i++) {
-                        if (cssClasses[i].substr(0, 7) == 'col-lg-') {
+                        if (/^col-(sm|md|lg)-\d+$/.test(cssClasses[i])) {
                             offset = cssClasses[i].substr(7);
                             break;
                         }
@@ -172,7 +172,7 @@
                 } else {
                     cssClasses = $parent.children().eq(0).attr('class').split(' ');
                     for (var i = 0; i < cssClasses.length; i++) {
-                        if (cssClasses[i].substr(0, 14) == 'col-lg-offset-') {
+                        if (/^col-(sm|md|lg)-offset-\d+$/.test(cssClasses[i])) {
                             offset = cssClasses[i].substr(14);
                             break;
                         }