Merge pull request #65 from DFE-Digital/feature/DSI-3969-update-jquer…

…y-3.6.0 Update jquery version and change deprecated trim function with JS def…
DFE-Digital · Aug 11, 2021 · 82e1cd3 · 82e1cd3
2 parents 75ecb4d + e2d0878
commit 82e1cd3
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/dist/gds-upgrade/javascript/app.min.js b/dist/gds-upgrade/javascript/app.min.js
diff --git a/dist/gds-upgrade/javascript/vendors/jquery.min.js b/dist/gds-upgrade/javascript/vendors/jquery.min.js
diff --git a/dist/javascript/app.min.js b/dist/javascript/app.min.js
diff --git a/dist/javascript/vendors/jquery.min.js b/dist/javascript/vendors/jquery.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "govuk_frontend_toolkit": "^7.2.0",
     "govuk_template_jinja": "^0.22.3",
     "govuk-frontend": "^3.11.0",
-    "jquery": "^3.2.1",
+    "jquery": "^3.6.0",
     "js-cookie": "^2.2.1",
     "nunjucks": "^3.2.0"
   },

diff --git a/src/gds-upgrade/javascript/app.js b/src/gds-upgrade/javascript/app.js
@@ -41,7 +41,7 @@ if ($('select.select2').length > 0) {
 
 function select2ModelMatcher (params, data) {
   data.parentText = data.parentText || "";
-  if ($.trim(params.term) === '') {
+  if (typeof(params.term) === 'undefined' || !params.term || params.term.trim() === '') {
     return data;
   }
   if (data.children && data.children.length > 0) {

diff --git a/src/pre-gds/javascript/app.js b/src/pre-gds/javascript/app.js
@@ -40,7 +40,7 @@ if ($('select.select2').length > 0) {
 
 function select2ModelMatcher (params, data) {
   data.parentText = data.parentText || "";
-  if ($.trim(params.term) === '') {
+  if (typeof(params.term) === 'undefined' || !params.term || params.term.trim() === '') {
     return data;
   }
   if (data.children && data.children.length > 0) {