Move jQuery.validate to bower

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index c49a26c0897d7d06a29e4199b3f725c03dc6d8f7..89bcdd9632f0b207b649047a0ea2a833ee0c1bd7 100644 (file)
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -710,7 +710,7 @@ class CRM_Core_Resources {
       "packages/jquery/plugins/jquery.blockUI$min.js",
       "packages/jquery/plugins/DataTables/media/js/jquery.dataTables$min.js",
       "packages/jquery/plugins/DataTables/media/css/jquery.dataTables$min.css",
-      "packages/jquery/plugins/jquery.validate$min.js",
+      "bower_components/jquery-validation/dist/jquery.validate$min.js",
       "packages/jquery/plugins/jquery.ui.datepicker.validation.pack.js",
       "js/Common.js",
       "js/crm.ajax.js",

diff --git a/bower.json b/bower.json
index 081516194ab47b133e104581ba64d94d7d5dcfd2..92688b2619b8b46971ba1064e6cb11b110fde3f1 100644 (file)
--- a/bower.json
+++ b/bower.json
@@ -19,7 +19,8 @@
     "jquery-ui": "~1.11",
     "lodash-compat": "~3.0",
     "google-code-prettify": "~1.0",
-    "select2": "colemanw/select2#stable/3.5"
+    "select2": "colemanw/select2#stable/3.5",
+    "jquery-validation": "~1.13"
   },
   "resolutions": {
     "angular": "~1.3.8"

diff --git a/karma.conf.js b/karma.conf.js
index d96880596b9c532b73a09773b94c3e09e6da8681..50c56bf3e94e34127f49510239d03972f15ebed3 100644 (file)
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -10,7 +10,7 @@ module.exports = function(config) {
       'bower_components/lodash-compat/lodash.min.js',
       'bower_components/select2/select2.min.js',
       'packages/jquery/plugins/jquery.blockUI.js',
-      'packages/jquery/plugins/jquery.validate.js',
+      'bower_components/jquery-validation/dist/jquery.validate.min.js',
       'packages/jquery/plugins/jquery.timeentry.js',
       'js/Common.js',
       'bower_components/angular/angular.js',