Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md
	dist/js/bootstrapValidator.min.js
	src/js/validator/callback.js

demo/validators.html

@@ -93,6 +93,14 @@
                                     <input type="text" class="form-control" name="usZipCode" />
                                 </div>
                             </div>
+
+                            <div class="form-group">
+                                <label class="col-lg-3 control-label">DK zip code</label>
+                                <div class="col-lg-3">
+                                    <input type="text" class="form-control" name="dkZipCode" />
+                                </div>
+                            </div>
+
                         </fieldset>
 
                         <fieldset>
@@ -211,6 +219,13 @@ $(document).ready(function() {
                     }
                 }
             },
+            dkZipCode: {
+                validators: {
+                    dkZipCode: {
+                        message: 'The input is not a valid DK zip code'
+                    }
+                }
+            },
             password: {
                 validators: {
                     notEmpty: {

src/js/validator/dkZipCode.js

@@ -0,0 +1,19 @@
+(function($) {
+    $.fn.bootstrapValidator.validators.dkZipCode = {
+        /**
+         * Return true if and only if the input value is a valid DK zip code
+         *
+         * @param {BootstrapValidator} validator The validator plugin instance
+         * @param {jQuery} $field Field element
+         * @param {Object} options
+         * @returns {Boolean}
+         */
+        validate: function(validateInstance, $field, options) {
+            var value = $field.val();
+            if (value == '') {
+                return true;
+            }
+            return /^(DK(-|\s)?)?\d{4}$/i.test(value);
+        }
+    };
+}(window.jQuery));