style: misc ESLint fixes

ministryofjustice · Jan 30, 2025 · 74c034a · 74c034a
1 parent d5fe40c
commit 74c034a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/docs/assets/javascript/cookies.mjs b/docs/assets/javascript/cookies.mjs
@@ -27,10 +27,6 @@ Cookies.prototype.init = function () {
 Cookies.prototype.load = function (config) {
   if (config.analytics) {
     window.dataLayer = window.dataLayer || []
-    function gtag() {
-      dataLayer.push(arguments)
-    }
-
     gtag('js', new Date())
     gtag('config', 'G-VTGX4YLSVL')
   } else {
@@ -60,4 +56,8 @@ Cookies.prototype.reject = function () {
   window.location.reload()
 }
 
+function gtag() {
+  dataLayer.push(arguments)
+}
+
 export default Cookies
diff --git a/gulp/build-compress-images.js b/gulp/build-compress-images.js
@@ -6,7 +6,7 @@ gulp.task('build:compress-images', async () => {
   const { default: imagemin } = await import('gulp-imagemin')
 
   return gulp
-    .src('package/moj/assets/images/' + '**/*.+(png|jpg|jpeg|gif|svg)')
+    .src('package/moj/assets/images/**/*.+(png|jpg|jpeg|gif|svg)')
     .pipe(
       cache(
         imagemin({

diff --git a/jest.setup.js b/jest.setup.js
@@ -2,6 +2,6 @@ require('@testing-library/jest-dom')
 require('./src/moj/vendor/jquery')
 require('mock-match-media/jest-setup')
 const { toHaveNoViolations } = require('jest-axe')
-expect.extend(toHaveNoViolations)
 
-MOJFrontend = {}
+expect.extend(toHaveNoViolations)
+window.MOJFrontend = {}
diff --git a/src/moj/components/form-validator/form-validator.js b/src/moj/components/form-validator/form-validator.js
@@ -20,7 +20,7 @@ MOJFrontend.FormValidator.entityMap = {
 }
 
 MOJFrontend.FormValidator.prototype.escapeHtml = function (string) {
-  return String(string).replace(/[&<>"'`=\/]/g, function fromEntityMap(s) {
+  return String(string).replace(/[&<>"'`=/]/g, function fromEntityMap(s) {
     return MOJFrontend.FormValidator.entityMap[s]
   })
 }