Merge branch 'master' into master

Author: brecons

README.md

@@ -4,21 +4,11 @@ Bootstrap v4.x Extension for [jQuery Validation Unobtrusive](https://github.com/
 This library is a extension for [jQuery Validation Unobtrusive](https://github.com/aspnet/jquery-validation-unobtrusive) and [jQuery Validation](https://github.com/jquery-validation/jquery-validation). It ensures the full compatibility between Bootstrap v4.x and jQuery Validation in interaction with ASP.NET Core.
 
 ## Installation
-You can get this library on Bower:
-```
-$ bower install jquery-validation-unobtrusive-bootstrap
-```
+You can get this library in different ways:
 
-or modify your package dependencies within `bower.json`:
-```javascript
-"dependencies": {
-	"bootstrap": "v4.0.0-beta",
-	"jquery": "3.2.1",
-	"jquery-validation": "1.17.0",
-	"jquery-validation-unobtrusive": "3.2.6",
-	"jquery-validation-unobtrusive-bootstrap": "2.0.0"
-}
-```
+Install with [npm](https://www.npmjs.com): `npm i jquery-validation-unobtrusive-bootstrap`
+Install with [yarn](https://yarnpkg.com): `yarn add jquery-validation-unobtrusive-bootstrap`
+Clone the [git](https://github.com) repository: `git clone https://github.com/brecons/jquery-validation-unobtrusive-bootstrap.git`
 
 ## Usage
 Just include the javascript after jquery.validate.unobtrusive and that's it!

bower.json

@@ -1,33 +1,38 @@
 (function ($) {
-    var defaultOptions = {
-        validClass: 'is-valid',
-        errorClass: 'is-invalid',
-        highlight: function (element, errorClass, validClass) {
-            $(element)
-                .removeClass(validClass)
-                .addClass(errorClass);
-        },
-        unhighlight: function (element, errorClass, validClass) {
-            $(element)
-                .removeClass(errorClass)
-                .addClass(validClass);
-        }
-    };
+    if($.validator && $.validator.unobtrusive){
+        var defaultOptions = {
+            validClass: 'is-valid',
+            errorClass: 'is-invalid',
+            highlight: function (element, errorClass, validClass) {
+                $(element)
+                    .removeClass(validClass)
+                    .addClass(errorClass);
+            },
+            unhighlight: function (element, errorClass, validClass) {
+                $(element)
+                    .removeClass(errorClass)
+                    .addClass(validClass);
+            }
+        };
 
-    $.validator.setDefaults(defaultOptions);
+        $.validator.setDefaults(defaultOptions);
 
-    $.validator.unobtrusive.options = {
-        errorClass: defaultOptions.errorClass,
-        validClass: defaultOptions.validClass,
-        errorElement: 'div',
-        errorPlacement: function (error, element) {
-            error.addClass('invalid-feedback');
+        $.validator.unobtrusive.options = {
+            errorClass: defaultOptions.errorClass,
+            validClass: defaultOptions.validClass,
+            errorElement: 'div',
+            errorPlacement: function (error, element) {
+                error.addClass('invalid-feedback');
 
-            if ($element.next().is(".input-group-append")) {
-                $error.insertAfter($element.next());
-            } else {
-                $error.insertAfter($element);
+                if ($element.next().is(".input-group-append")) {
+                    $error.insertAfter($element.next());
+                } else {
+                    $error.insertAfter($element);
+                }
             }
-        }
-    };
+        };
+    }
+    else {
+        console.warn('$.validator is not defined. Please load this library **after** loading jquery.validate.js and jquery.validate.unobtrusive.js');
+    }
 })(jQuery);

dist/unobtrusive-bootstrap.js

@@ -0,0 +1,14 @@
+{
+  "name": "jquery-validation-unobtrusive-bootstrap",
+  "version": "2.0.2",
+  "description": "Add-on to jQuery Validation to make unobtrusive validation compatible to Bootstrap v4.x.",
+  "homepage": "https://www.brecons.net",
+  "bugs": "https://github.com/brecons/jquery-validation-unobtrusive-bootstrap/issues",
+  "author": "Timm Bremus <[email protected]>",
+  "license": "MIT",
+  "main": "dist/unobtrusive-bootstrap.js",
+  "files": [
+    "dist/*.js"
+  ],
+  "repository": "https://github.com/brecons/jquery-validation-unobtrusive-bootstrap"
+}