From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 22 Mar 2015 20:50:34 +0000 (-0400)
Subject: Move jQuery.validate to bower
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3426f10d5d829b79d6902521881bfc15b9f990b0;p=civicrm-core.git

Move jQuery.validate to bower
---

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index c49a26c089..89bcdd9632 100644
--- 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 081516194a..92688b2619 100644
--- 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 d96880596b..50c56bf3e9 100644
--- 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',