浏览代码

Merge remote-tracking branch 'origin/master'

Conflicts:
	dist/js/bootstrapValidator.min.js
nghuuphuoc 11 年之前
父节点
当前提交
ee1a746ae2
共有 5 个文件被更改,包括 7 次插入6 次删除
  1. 1 0
      CHANGELOG.md
  2. 3 3
      dist/js/bootstrapValidator.js
  3. 1 1
      src/js/bootstrapValidator.js
  4. 1 1
      src/js/validator/id.js
  5. 1 1
      src/js/validator/vat.js

+ 1 - 0
CHANGELOG.md

@@ -49,6 +49,7 @@ __Bug Fixes__
 * [#315](https://github.com/nghuuphuoc/bootstrapvalidator/issues/315): The [```cvv``` validator](http://bootstrapvalidator.com/validators/cvv/) doesn't work on IE 8
 * [#315](https://github.com/nghuuphuoc/bootstrapvalidator/issues/315): The [```cvv``` validator](http://bootstrapvalidator.com/validators/cvv/) doesn't work on IE 8
 * [#325](https://github.com/nghuuphuoc/bootstrapvalidator/issues/325): The [```threshold``` option](http://bootstrapvalidator.com/settings/#threshold) doesn't work on IE 8
 * [#325](https://github.com/nghuuphuoc/bootstrapvalidator/issues/325): The [```threshold``` option](http://bootstrapvalidator.com/settings/#threshold) doesn't work on IE 8
 * [#358](https://github.com/nghuuphuoc/bootstrapvalidator/issues/358): The [```zipCode``` validator](http://bootstrapvalidator.com/validators/zipCode/) doesn't work for Canadian zip code
 * [#358](https://github.com/nghuuphuoc/bootstrapvalidator/issues/358): The [```zipCode``` validator](http://bootstrapvalidator.com/validators/zipCode/) doesn't work for Canadian zip code
+* [#377](https://github.com/nghuuphuoc/bootstrapvalidator/issues/377): The [id](http://bootstrapvalidator.com/validators/id/), [vat](http://bootstrapvalidator.com/validators/vat/) validators should return ```false``` if the country code is not supported
 
 
 __Document__
 __Document__
 * [#259](https://github.com/nghuuphuoc/bootstrapvalidator/issues/259): Typo "Support almost Bootstrap forms", thanks to [@lloydde](https://github.com/lloydde)
 * [#259](https://github.com/nghuuphuoc/bootstrapvalidator/issues/259): Typo "Support almost Bootstrap forms", thanks to [@lloydde](https://github.com/lloydde)

+ 3 - 3
dist/js/bootstrapValidator.js

@@ -1280,7 +1280,7 @@
          * It will remove all error messages, feedback icons and turn off the events
          * It will remove all error messages, feedback icons and turn off the events
          */
          */
         destroy: function() {
         destroy: function() {
-            var field, fields, $field, validator, $icon, container;
+            var field, fields, $field, validator, $icon, container, group;
             for (field in this.options.fields) {
             for (field in this.options.fields) {
                 fields    = this.getFieldElements(field);
                 fields    = this.getFieldElements(field);
                 container = this.options.fields[field].container || this.options.container,
                 container = this.options.fields[field].container || this.options.container,
@@ -2430,7 +2430,7 @@
                 return this[method](value);
                 return this[method](value);
             }
             }
 
 
-            return true;
+            return false;
         },
         },
 
 
         /**
         /**
@@ -4216,7 +4216,7 @@
                 return this[method](value);
                 return this[method](value);
             }
             }
 
 
-            return true;
+            return false;
         },
         },
 
 
         // VAT validators
         // VAT validators

+ 1 - 1
src/js/bootstrapValidator.js

@@ -1279,7 +1279,7 @@
          * It will remove all error messages, feedback icons and turn off the events
          * It will remove all error messages, feedback icons and turn off the events
          */
          */
         destroy: function() {
         destroy: function() {
-            var field, fields, $field, validator, $icon, container;
+            var field, fields, $field, validator, $icon, container, group;
             for (field in this.options.fields) {
             for (field in this.options.fields) {
                 fields    = this.getFieldElements(field);
                 fields    = this.getFieldElements(field);
                 container = this.options.fields[field].container || this.options.container,
                 container = this.options.fields[field].container || this.options.container,

+ 1 - 1
src/js/validator/id.js

@@ -28,7 +28,7 @@
                 return this[method](value);
                 return this[method](value);
             }
             }
 
 
-            return true;
+            return false;
         },
         },
 
 
         /**
         /**

+ 1 - 1
src/js/validator/vat.js

@@ -27,7 +27,7 @@
                 return this[method](value);
                 return this[method](value);
             }
             }
 
 
-            return true;
+            return false;
         },
         },
 
 
         // VAT validators
         // VAT validators