@ministryofjustice/frontend 3.6.1 → 3.6.3

package/moj/components/badge/template.njk

@@ -1,3 +1,3 @@
-<span class="moj-badge {{- ' ' + params.classes if params.classes }}" {%- if (params.label) %} aria-label=""{% endif -%} {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
+<span class="moj-badge {{- " " + params.classes if params.classes }}" {%- if (params.label) %} aria-label=""{% endif -%} {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
   {{- params.html | safe if params.html else params.text -}}
 </span>

package/moj/components/banner/template.njk

@@ -1,11 +1,11 @@
 {#- Set classes for this component #}
 {%- set classNames = ["moj-banner"] -%}
 
-{%- if params.type == 'success' %}
+{%- if params.type == "success" %}
   {%- set classNames = classNames.concat("moj-banner--success") %}
-{%- elif params.type == 'warning' %}
+{%- elif params.type == "warning" %}
   {%- set classNames = classNames.concat("moj-banner--warning") %}
-{%- elif params.type == 'information' %}
+{%- elif params.type == "information" %}
   {%- set classNames = classNames.concat("moj-banner--information") %}
 {%- endif %}
 
@@ -13,22 +13,22 @@
   {%- set classNames = classNames.concat(params.classes) %}
 {%- endif %}
 
-{%- set classNames = classNames | join(' ') -%}
+{%- set classNames = classNames | join(" ") -%}
 
-<div 
-  class="{{ classNames }}" 
-    {%- for attribute, value in params.attributes %} 
+<div
+  class="{{ classNames }}"
+    {%- for attribute, value in params.attributes %}
       {{ attribute }}="{{ value }}"
     {% endfor %}
   role="region"
   aria-label="{{ params.iconFallbackText | default(params.type) | default("banner") }}"
 >
 
-  {% if params.type == 'success' %}
+  {% if params.type == "success" %}
     <svg class="moj-banner__icon" fill="currentColor" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25" height="25" width="25"><path d="M25,6.2L8.7,23.2L0,14.1l4-4.2l4.7,4.9L21,2L25,6.2z"/></svg>
-  {% elif params.type == 'warning' %}
+  {% elif params.type == "warning" %}
     <svg class="moj-banner__icon" fill="currentColor" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25" height="25" width="25"><path d="M13.6,15.4h-2.3v-4.5h2.3V15.4z M13.6,19.8h-2.3v-2.2h2.3V19.8z M0,23.2h25L12.5,2L0,23.2z"/></svg>
-  {% elif params.type == 'information' %}
+  {% elif params.type == "information" %}
     <svg class="moj-banner__icon" fill="currentColor" role="presentation" focusable="false" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25" height="25" width="25"><path d="M13.7,18.5h-2.4v-2.4h2.4V18.5z M12.5,13.7c-0.7,0-1.2-0.5-1.2-1.2V7.7c0-0.7,0.5-1.2,1.2-1.2s1.2,0.5,1.2,1.2v4.8
 	C13.7,13.2,13.2,13.7,12.5,13.7z M12.5,0.5c-6.6,0-12,5.4-12,12s5.4,12,12,12s12-5.4,12-12S19.1,0.5,12.5,0.5z"/></svg>
   {% endif %}
@@ -37,4 +37,4 @@
     {{- params.html | safe if params.html else params.text -}}
   </div>
 
-</div>
+</div>

package/moj/components/cookie-banner/_cookie-banner.scss

@@ -1,4 +1,4 @@
-@import "govuk-frontend/dist/govuk/objects/width-container";
+@import "node_modules/govuk-frontend/dist/govuk/objects/width-container";
 
 .moj-cookie-banner {
   box-sizing: border-box;

package/moj/components/cookie-banner/template.njk

@@ -12,7 +12,7 @@
                     <div class="govuk-grid-column-full govuk-grid-column-one-half-from-desktop">
                         {{ govukButton({
                             text: item.text,
-                            classes: 'govuk-button button--inline ' + item.class,
+                            classes: "govuk-button button--inline " + item.class,
                             type: item.type,
                             element: item.element,
                             href: item.href

package/moj/components/currency-input/template.njk

@@ -15,8 +15,8 @@
     for: params.id
   }) | indent(2) | trim }}
 {% if params.hint %}
-  {% set hintId = params.id + '-hint' %}
-  {% set describedBy = describedBy + ' ' + hintId if describedBy else hintId %}
+  {% set hintId = params.id + "-hint" %}
+  {% set describedBy = describedBy + " " + hintId if describedBy else hintId %}
   {{ govukHint({
     id: hintId,
     classes: params.hint.classes,
@@ -26,8 +26,8 @@
   }) | indent(2) | trim }}
 {% endif %}
 {% if params.errorMessage %}
-  {% set errorId = params.id + '-error' %}
-  {% set describedBy = describedBy + ' ' + errorId if describedBy else errorId %}
+  {% set errorId = params.id + "-error" %}
+  {% set describedBy = describedBy + " " + errorId if describedBy else errorId %}
   {{ govukErrorMessage({
     id: errorId,
     classes: params.errorMessage.classes,
@@ -37,13 +37,13 @@
     visuallyHiddenText: params.errorMessage.visuallyHiddenText
   }) | indent(2) | trim }}
 {% endif %}
-  <span class="moj-label__currency {%- if params.errorMessage %} moj-label__currency--error{% endif %} {{- ' ' + params.currencyLabel.classes if params.currencyLabel.classes}}">
-    {{- params.currencyLabel.html if params.currencyLabel.html else params.currencyLabel.text | default('&pound;') | safe -}}
+  <span class="moj-label__currency {%- if params.errorMessage %} moj-label__currency--error{% endif %} {{- " " + params.currencyLabel.classes if params.currencyLabel.classes}}">
+    {{- params.currencyLabel.html if params.currencyLabel.html else params.currencyLabel.text | default("&pound;") | safe -}}
   </span>
-  <input class="govuk-input moj-input__currency {{- ' ' + params.classes if params.classes}} {%- if params.errorMessage %} govuk-input--error{% endif %}" id="{{ params.id }}" name="{{ params.name }}" type="{{ params.type | default('text') }}"
+  <input class="govuk-input moj-input__currency {{- " " + params.classes if params.classes}} {%- if params.errorMessage %} govuk-input--error{% endif %}" id="{{ params.id }}" name="{{ params.name }}" type="{{ params.type | default("text") }}"
   {%- if params.value %} value="{{ params.value }}"{% endif %}
   {%- if describedBy %} aria-describedby="{{ describedBy }}"{% endif %}
-  autocomplete="{{ params.autocomplete | default('off') }}"
-  pattern="{{ params.pattern | default('[0-9]*') }}"
+  autocomplete="{{ params.autocomplete | default("off") }}"
+  pattern="{{ params.pattern | default("[0-9]*") }}"
   {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor -%}>
-</div>
+</div>

package/moj/components/date-picker/template.njk

@@ -8,7 +8,7 @@
 {% endif %}
 
 {% set attributes = {
-  "data-module": 'moj-date-picker',
+  "data-module": "moj-date-picker",
   "data-min-date": {
     value: params.minDate,
     optional: true
@@ -44,7 +44,7 @@
       autocomplete: "off",
       formGroup: params.formGroup,
       label: params.label,
-      hint: params.hint,        
+      hint: params.hint,
       errorMessage: params.errorMessage
     }) }}
 </div>

package/moj/components/filter/template.njk

@@ -48,7 +48,7 @@
     <div class="moj-filter__options">
 
       {{ govukButton({
-        text: params.submit.text if params.submit.text else 'Apply filters',
+        text: params.submit.text if params.submit.text else "Apply filters",
         attributes: params.submit.attributes
       }) }}
 

package/moj/components/filter-toggle-button/filter-toggle-button.js

@@ -6,8 +6,8 @@
 
   function FilterToggleButton(options) {
     this.options = options;
-    this.container = window.jQuery(this.options.toggleButton.container);
-    this.filterContainer = window.jQuery(this.options.filter.container);
+    this.container = $(this.options.toggleButton.container);
+    this.filterContainer = $(this.options.filter.container);
 
     this.createToggleButton();
     this.setupResponsiveChecks();
@@ -19,15 +19,15 @@
 
   FilterToggleButton.prototype.setupResponsiveChecks = function () {
     this.mq = window.matchMedia(this.options.bigModeMediaQuery);
-    this.mq.addListener(window.jQuery.proxy(this, 'checkMode'));
+    this.mq.addListener($.proxy(this, 'checkMode'));
     this.checkMode(this.mq);
   };
 
   FilterToggleButton.prototype.createToggleButton = function () {
-    this.menuButton = window.jQuery(
+    this.menuButton = $(
       `<button class="govuk-button ${this.options.toggleButton.classes}" type="button" aria-haspopup="true" aria-expanded="false">${this.options.toggleButton.showText}</button>`
     );
-    this.menuButton.on('click', window.jQuery.proxy(this, 'onMenuButtonClick'));
+    this.menuButton.on('click', $.proxy(this, 'onMenuButtonClick'));
     this.container.append(this.menuButton);
   };
 
@@ -51,11 +51,11 @@
 
   FilterToggleButton.prototype.addCloseButton = function () {
     if (this.options.closeButton) {
-      this.closeButton = window.jQuery(
+      this.closeButton = $(
         `<button class="moj-filter__close" type="button">${this.options.closeButton.text}</button>`
       );
-      this.closeButton.on('click', window.jQuery.proxy(this, 'onCloseClick'));
-      window.jQuery(this.options.closeButton.container).append(this.closeButton);
+      this.closeButton.on('click', $.proxy(this, 'onCloseClick'));
+      $(this.options.closeButton.container).append(this.closeButton);
     }
   };
 

package/moj/components/filter-toggle-button/filter-toggle-button.mjs

@@ -1,7 +1,7 @@
 function FilterToggleButton(options) {
   this.options = options;
-  this.container = window.jQuery(this.options.toggleButton.container);
-  this.filterContainer = window.jQuery(this.options.filter.container);
+  this.container = $(this.options.toggleButton.container);
+  this.filterContainer = $(this.options.filter.container);
 
   this.createToggleButton();
   this.setupResponsiveChecks();
@@ -13,15 +13,15 @@ function FilterToggleButton(options) {
 
 FilterToggleButton.prototype.setupResponsiveChecks = function () {
   this.mq = window.matchMedia(this.options.bigModeMediaQuery);
-  this.mq.addListener(window.jQuery.proxy(this, 'checkMode'));
+  this.mq.addListener($.proxy(this, 'checkMode'));
   this.checkMode(this.mq);
 };
 
 FilterToggleButton.prototype.createToggleButton = function () {
-  this.menuButton = window.jQuery(
+  this.menuButton = $(
     `<button class="govuk-button ${this.options.toggleButton.classes}" type="button" aria-haspopup="true" aria-expanded="false">${this.options.toggleButton.showText}</button>`
   );
-  this.menuButton.on('click', window.jQuery.proxy(this, 'onMenuButtonClick'));
+  this.menuButton.on('click', $.proxy(this, 'onMenuButtonClick'));
   this.container.append(this.menuButton);
 };
 
@@ -45,11 +45,11 @@ FilterToggleButton.prototype.enableSmallMode = function () {
 
 FilterToggleButton.prototype.addCloseButton = function () {
   if (this.options.closeButton) {
-    this.closeButton = window.jQuery(
+    this.closeButton = $(
       `<button class="moj-filter__close" type="button">${this.options.closeButton.text}</button>`
     );
-    this.closeButton.on('click', window.jQuery.proxy(this, 'onCloseClick'));
-    window.jQuery(this.options.closeButton.container).append(this.closeButton);
+    this.closeButton.on('click', $.proxy(this, 'onCloseClick'));
+    $(this.options.closeButton.container).append(this.closeButton);
   }
 };
 

package/moj/components/form-validator/form-validator.js

@@ -38,9 +38,9 @@
     this.form = form;
     this.errors = [];
     this.validators = [];
-    window.jQuery(this.form).on('submit', window.jQuery.proxy(this, 'onSubmit'));
+    $(this.form).on('submit', $.proxy(this, 'onSubmit'));
     this.summary =
-      options && options.summary ? window.jQuery(options.summary) : window.jQuery('.govuk-error-summary');
+      options && options.summary ? $(options.summary) : $('.govuk-error-summary');
     this.originalTitle = document.title;
   }
 
@@ -122,7 +122,7 @@
     const errorSpan = `<span class="govuk-error-message" id="${
     errorSpanId
   }">${this.escapeHtml(error.message)}</span>`;
-    const control = window.jQuery(`#${error.fieldName}`);
+    const control = $(`#${error.fieldName}`);
     const fieldContainer = control.parents('.govuk-form-group');
     const label = fieldContainer.find('label');
     const legend = fieldContainer.find('legend');
@@ -146,7 +146,7 @@
   };
 
   FormValidator.prototype.removeInlineError = function (error) {
-    const control = window.jQuery(`#${error.fieldName}`);
+    const control = $(`#${error.fieldName}`);
     const fieldContainer = control.parents('.govuk-form-group');
     fieldContainer.find('.govuk-error-message').remove();
     fieldContainer.removeClass('govuk-form-group--error');

package/moj/components/form-validator/form-validator.mjs

@@ -4,9 +4,9 @@ function FormValidator(form, options) {
   this.form = form;
   this.errors = [];
   this.validators = [];
-  window.jQuery(this.form).on('submit', window.jQuery.proxy(this, 'onSubmit'));
+  $(this.form).on('submit', $.proxy(this, 'onSubmit'));
   this.summary =
-    options && options.summary ? window.jQuery(options.summary) : window.jQuery('.govuk-error-summary');
+    options && options.summary ? $(options.summary) : $('.govuk-error-summary');
   this.originalTitle = document.title;
 }
 
@@ -88,7 +88,7 @@ FormValidator.prototype.showInlineError = function (error) {
   const errorSpan = `<span class="govuk-error-message" id="${
     errorSpanId
   }">${this.escapeHtml(error.message)}</span>`;
-  const control = window.jQuery(`#${error.fieldName}`);
+  const control = $(`#${error.fieldName}`);
   const fieldContainer = control.parents('.govuk-form-group');
   const label = fieldContainer.find('label');
   const legend = fieldContainer.find('legend');
@@ -112,7 +112,7 @@ FormValidator.prototype.removeInlineErrors = function () {
 };
 
 FormValidator.prototype.removeInlineError = function (error) {
-  const control = window.jQuery(`#${error.fieldName}`);
+  const control = $(`#${error.fieldName}`);
   const fieldContainer = control.parents('.govuk-form-group');
   fieldContainer.find('.govuk-error-message').remove();
   fieldContainer.removeClass('govuk-form-group--error');

package/moj/components/header/template.njk

@@ -1,10 +1,10 @@
-<header class="moj-header {{- ' ' + params.classes if params.classes}}" role="banner" {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
+<header class="moj-header {{- " " + params.classes if params.classes}}" role="banner" {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
 
   <div class="moj-header__container {%- if params.containerClasses %} {{ params.containerClasses }}{% endif %}">
 
     <div class="moj-header__logo">
 
-      {%- if params.logotype == 'crown' %}
+      {%- if params.logotype == "crown" %}
 
         <svg aria-hidden="true" focusable="false" class="moj-header__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 132 97" height="32" width="36">
           <path fill="#ffffff" fill-rule="evenodd" d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
@@ -49,24 +49,24 @@
       {% endif -%}
 
       {%- if (params.organisationLabel) %}
-        {% set organisationLabelElement = 'span' %}
+        {% set organisationLabelElement = "span" %}
         {%- if (params.organisationLabel.href) %}
-          {% set organisationLabelElement = 'a' %}
+          {% set organisationLabelElement = "a" %}
         {% endif -%}
 
-        <{{organisationLabelElement}} class="moj-header__link moj-header__link--organisation-name" {% if params.organisationLabel.href %} href="{{ params.organisationLabel.href | default('/') }}" {% endif %}>
+        <{{organisationLabelElement}} class="moj-header__link moj-header__link--organisation-name" {% if params.organisationLabel.href %} href="{{ params.organisationLabel.href | default("/") }}" {% endif %}>
           {{- params.organisationLabel.html | safe if params.organisationLabel.html else params.organisationLabel.text -}}
         </{{organisationLabelElement}}>
       {% endif -%}
 
 
       {%- if (params.serviceLabel) %}
-        {% set serviceLabelElement = 'span' %}
+        {% set serviceLabelElement = "span" %}
         {%- if (params.serviceLabel.href) %}
-          {% set serviceLabelElement = 'a' %}
+          {% set serviceLabelElement = "a" %}
         {% endif -%}
 
-        <{{serviceLabelElement}} class="moj-header__link moj-header__link--service-name" {% if params.serviceLabel.href %} href="{{ params.serviceLabel.href | default('/') }}" {% endif %}>
+        <{{serviceLabelElement}} class="moj-header__link moj-header__link--service-name" {% if params.serviceLabel.href %} href="{{ params.serviceLabel.href | default("/") }}" {% endif %}>
           {{- params.serviceLabel.html | safe if params.serviceLabel.html else params.serviceLabel.text -}}
         </{{serviceLabelElement}}>
       {% endif -%}

package/moj/components/identity-bar/template.njk

@@ -1,6 +1,6 @@
 {%- from "moj/components/button-menu/macro.njk" import mojButtonMenu %}
 {% from "govuk/macros/attributes.njk" import govukAttributes %}
-<div class="moj-identity-bar {{- ' ' + params.classes if params.classes}}" {{- govukAttributes(params.attributes) -}}>
+<div class="moj-identity-bar {{- " " + params.classes if params.classes}}" {{- govukAttributes(params.attributes) -}}>
     <div class="moj-identity-bar__container">
         <div class="moj-identity-bar__details">
             {% if params.title %}

package/moj/components/messages/template.njk

@@ -1,13 +1,13 @@
-<div id="{{ params.id | default('messages') }}" class="moj-messages-container {{- ' ' + params.classes if params.classes}}" {%- if (params.label) %} aria-label="{{ params.label }}"{% endif %} {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
+<div id="{{ params.id | default("messages") }}" class="moj-messages-container {{- " " + params.classes if params.classes}}" {%- if (params.label) %} aria-label="{{ params.label }}"{% endif %} {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor %}>
 
   <div class="moj-message-list">
 
     {%- for item in params.items %}
 
-      {%- if previous_timestamp != item.timestamp | mojDate('date') %}
+      {%- if previous_timestamp != item.timestamp | mojDate("date") %}
 
-        <time class="moj-message-list__date" datetime="{{ item.timestamp | mojDate('date') }}">
-          {{- item.timestamp | mojDate('date') -}}
+        <time class="moj-message-list__date" datetime="{{ item.timestamp | mojDate("date") }}">
+          {{- item.timestamp | mojDate("date") -}}
         </time>
 
       {% endif -%}
@@ -17,11 +17,11 @@
           {{- item.html | safe if item.html else item.text -}}
         </div>
         <div class="moj-message-item__meta">
-          <span class="moj-message-item__meta--sender">{{ item.sender }}</span> at <time class="moj-message-item__meta--timestamp" datetime="{{ item.timestamp | mojDate('time') }}">{{ item.timestamp | mojDate('time') }}</time>
+          <span class="moj-message-item__meta--sender">{{ item.sender }}</span> at <time class="moj-message-item__meta--timestamp" datetime="{{ item.timestamp | mojDate("time") }}">{{ item.timestamp | mojDate("time") }}</time>
         </div>
       </div>
 
-      {%- set previous_timestamp = item.timestamp | mojDate('date') -%}
+      {%- set previous_timestamp = item.timestamp | mojDate("date") -%}
 
     {% endfor -%}
 

package/moj/components/multi-file-upload/multi-file-upload.js

@@ -25,17 +25,17 @@
     }
 
     this.defaultParams = {
-      uploadFileEntryHook: window.jQuery.noop,
-      uploadFileExitHook: window.jQuery.noop,
-      uploadFileErrorHook: window.jQuery.noop,
-      fileDeleteHook: window.jQuery.noop,
+      uploadFileEntryHook: $.noop,
+      uploadFileExitHook: $.noop,
+      uploadFileErrorHook: $.noop,
+      fileDeleteHook: $.noop,
       uploadStatusText: 'Uploading files, please wait',
       dropzoneHintText: 'Drag and drop files here or',
       dropzoneButtonText: 'Choose files'
     };
 
-    this.params = window.jQuery.extend({}, this.defaultParams, params);
-    this.container = window.jQuery(this.params.container);
+    this.params = $.extend({}, this.defaultParams, params);
+    this.container = $(this.params.container);
 
     this.container.addClass('moj-multi-file-upload--enhanced');
 
@@ -49,20 +49,20 @@
     this.container.on(
       'click',
       '.moj-multi-file-upload__delete',
-      window.jQuery.proxy(this, 'onFileDeleteClick')
+      $.proxy(this, 'onFileDeleteClick')
     );
   }
 
   MultiFileUpload.prototype.setupDropzone = function () {
     this.fileInput.wrap('<div class="moj-multi-file-upload__dropzone" />');
     this.dropzone = this.container.find('.moj-multi-file-upload__dropzone');
-    this.dropzone.on('dragover', window.jQuery.proxy(this, 'onDragOver'));
-    this.dropzone.on('dragleave', window.jQuery.proxy(this, 'onDragLeave'));
-    this.dropzone.on('drop', window.jQuery.proxy(this, 'onDrop'));
+    this.dropzone.on('dragover', $.proxy(this, 'onDragOver'));
+    this.dropzone.on('dragleave', $.proxy(this, 'onDragLeave'));
+    this.dropzone.on('drop', $.proxy(this, 'onDrop'));
   };
 
   MultiFileUpload.prototype.setupLabel = function () {
-    this.label = window.jQuery(
+    this.label = $(
       `<label for="${this.fileInput[0].id}" class="govuk-button govuk-button--secondary">${this.params.dropzoneButtonText}</label>`
     );
     this.dropzone.append(
@@ -73,13 +73,13 @@
 
   MultiFileUpload.prototype.setupFileInput = function () {
     this.fileInput = this.container.find('.moj-multi-file-upload__input');
-    this.fileInput.on('change', window.jQuery.proxy(this, 'onFileChange'));
-    this.fileInput.on('focus', window.jQuery.proxy(this, 'onFileFocus'));
-    this.fileInput.on('blur', window.jQuery.proxy(this, 'onFileBlur'));
+    this.fileInput.on('change', $.proxy(this, 'onFileChange'));
+    this.fileInput.on('focus', $.proxy(this, 'onFileFocus'));
+    this.fileInput.on('blur', $.proxy(this, 'onFileBlur'));
   };
 
   MultiFileUpload.prototype.setupStatusBox = function () {
-    this.status = window.jQuery(
+    this.status = $(
       '<div aria-live="polite" role="status" class="govuk-visually-hidden" />'
     );
     this.dropzone.append(this.status);
@@ -112,7 +112,7 @@
     this.feedbackContainer.removeClass('moj-hidden');
     this.status.html(this.params.uploadStatusText);
     this.uploadFiles(e.currentTarget.files);
-    this.fileInput.replaceWith(window.jQuery(e.currentTarget).val('').clone(true));
+    this.fileInput.replaceWith($(e.currentTarget).val('').clone(true));
     this.setupFileInput();
     this.fileInput.get(0).focus();
   };
@@ -153,18 +153,18 @@
 
   MultiFileUpload.prototype.uploadFile = function (file) {
     this.params.uploadFileEntryHook(this, file);
-    const item = window.jQuery(this.getFileRowHtml(file));
+    const item = $(this.getFileRowHtml(file));
     const formData = new FormData();
     formData.append('documents', file);
     this.feedbackContainer.find('.moj-multi-file-upload__list').append(item);
 
-    window.jQuery.ajax({
+    $.ajax({
       url: this.params.uploadUrl,
       type: 'post',
       data: formData,
       processData: false,
       contentType: false,
-      success: window.jQuery.proxy(function (response) {
+      success: $.proxy(function (response) {
         if (response.error) {
           item
             .find('.moj-multi-file-upload__message')
@@ -181,7 +181,7 @@
           .append(this.getDeleteButtonHtml(response.file));
         this.params.uploadFileExitHook(this, file, response);
       }, this),
-      error: window.jQuery.proxy(function (jqXHR, textStatus, errorThrown) {
+      error: $.proxy(function (jqXHR, textStatus, errorThrown) {
         this.params.uploadFileErrorHook(
           this,
           file,
@@ -212,15 +212,15 @@
 
   MultiFileUpload.prototype.onFileDeleteClick = function (e) {
     e.preventDefault(); // if user refreshes page and then deletes
-    const button = window.jQuery(e.currentTarget);
+    const button = $(e.currentTarget);
     const data = {};
     data[button[0].name] = button[0].value;
-    window.jQuery.ajax({
+    $.ajax({
       url: this.params.deleteUrl,
       type: 'post',
       dataType: 'json',
       data,
-      success: window.jQuery.proxy(function (response) {
+      success: $.proxy(function (response) {
         if (response.error) ; else {
           button.parents('.moj-multi-file-upload__row').remove();
           if (

package/moj/components/multi-file-upload/multi-file-upload.mjs

@@ -6,17 +6,17 @@ function MultiFileUpload(params) {
   }
 
   this.defaultParams = {
-    uploadFileEntryHook: window.jQuery.noop,
-    uploadFileExitHook: window.jQuery.noop,
-    uploadFileErrorHook: window.jQuery.noop,
-    fileDeleteHook: window.jQuery.noop,
+    uploadFileEntryHook: $.noop,
+    uploadFileExitHook: $.noop,
+    uploadFileErrorHook: $.noop,
+    fileDeleteHook: $.noop,
     uploadStatusText: 'Uploading files, please wait',
     dropzoneHintText: 'Drag and drop files here or',
     dropzoneButtonText: 'Choose files'
   };
 
-  this.params = window.jQuery.extend({}, this.defaultParams, params);
-  this.container = window.jQuery(this.params.container);
+  this.params = $.extend({}, this.defaultParams, params);
+  this.container = $(this.params.container);
 
   this.container.addClass('moj-multi-file-upload--enhanced');
 
@@ -30,20 +30,20 @@ function MultiFileUpload(params) {
   this.container.on(
     'click',
     '.moj-multi-file-upload__delete',
-    window.jQuery.proxy(this, 'onFileDeleteClick')
+    $.proxy(this, 'onFileDeleteClick')
   );
 }
 
 MultiFileUpload.prototype.setupDropzone = function () {
   this.fileInput.wrap('<div class="moj-multi-file-upload__dropzone" />');
   this.dropzone = this.container.find('.moj-multi-file-upload__dropzone');
-  this.dropzone.on('dragover', window.jQuery.proxy(this, 'onDragOver'));
-  this.dropzone.on('dragleave', window.jQuery.proxy(this, 'onDragLeave'));
-  this.dropzone.on('drop', window.jQuery.proxy(this, 'onDrop'));
+  this.dropzone.on('dragover', $.proxy(this, 'onDragOver'));
+  this.dropzone.on('dragleave', $.proxy(this, 'onDragLeave'));
+  this.dropzone.on('drop', $.proxy(this, 'onDrop'));
 };
 
 MultiFileUpload.prototype.setupLabel = function () {
-  this.label = window.jQuery(
+  this.label = $(
     `<label for="${this.fileInput[0].id}" class="govuk-button govuk-button--secondary">${this.params.dropzoneButtonText}</label>`
   );
   this.dropzone.append(
@@ -54,13 +54,13 @@ MultiFileUpload.prototype.setupLabel = function () {
 
 MultiFileUpload.prototype.setupFileInput = function () {
   this.fileInput = this.container.find('.moj-multi-file-upload__input');
-  this.fileInput.on('change', window.jQuery.proxy(this, 'onFileChange'));
-  this.fileInput.on('focus', window.jQuery.proxy(this, 'onFileFocus'));
-  this.fileInput.on('blur', window.jQuery.proxy(this, 'onFileBlur'));
+  this.fileInput.on('change', $.proxy(this, 'onFileChange'));
+  this.fileInput.on('focus', $.proxy(this, 'onFileFocus'));
+  this.fileInput.on('blur', $.proxy(this, 'onFileBlur'));
 };
 
 MultiFileUpload.prototype.setupStatusBox = function () {
-  this.status = window.jQuery(
+  this.status = $(
     '<div aria-live="polite" role="status" class="govuk-visually-hidden" />'
   );
   this.dropzone.append(this.status);
@@ -93,7 +93,7 @@ MultiFileUpload.prototype.onFileChange = function (e) {
   this.feedbackContainer.removeClass('moj-hidden');
   this.status.html(this.params.uploadStatusText);
   this.uploadFiles(e.currentTarget.files);
-  this.fileInput.replaceWith(window.jQuery(e.currentTarget).val('').clone(true));
+  this.fileInput.replaceWith($(e.currentTarget).val('').clone(true));
   this.setupFileInput();
   this.fileInput.get(0).focus();
 };
@@ -134,18 +134,18 @@ MultiFileUpload.prototype.getDeleteButtonHtml = function (file) {
 
 MultiFileUpload.prototype.uploadFile = function (file) {
   this.params.uploadFileEntryHook(this, file);
-  const item = window.jQuery(this.getFileRowHtml(file));
+  const item = $(this.getFileRowHtml(file));
   const formData = new FormData();
   formData.append('documents', file);
   this.feedbackContainer.find('.moj-multi-file-upload__list').append(item);
 
-  window.jQuery.ajax({
+  $.ajax({
     url: this.params.uploadUrl,
     type: 'post',
     data: formData,
     processData: false,
     contentType: false,
-    success: window.jQuery.proxy(function (response) {
+    success: $.proxy(function (response) {
       if (response.error) {
         item
           .find('.moj-multi-file-upload__message')
@@ -162,7 +162,7 @@ MultiFileUpload.prototype.uploadFile = function (file) {
         .append(this.getDeleteButtonHtml(response.file));
       this.params.uploadFileExitHook(this, file, response);
     }, this),
-    error: window.jQuery.proxy(function (jqXHR, textStatus, errorThrown) {
+    error: $.proxy(function (jqXHR, textStatus, errorThrown) {
       this.params.uploadFileErrorHook(
         this,
         file,
@@ -193,15 +193,15 @@ MultiFileUpload.prototype.uploadFile = function (file) {
 
 MultiFileUpload.prototype.onFileDeleteClick = function (e) {
   e.preventDefault(); // if user refreshes page and then deletes
-  const button = window.jQuery(e.currentTarget);
+  const button = $(e.currentTarget);
   const data = {};
   data[button[0].name] = button[0].value;
-  window.jQuery.ajax({
+  $.ajax({
     url: this.params.deleteUrl,
     type: 'post',
     dataType: 'json',
     data,
-    success: window.jQuery.proxy(function (response) {
+    success: $.proxy(function (response) {
       if (response.error) ; else {
         button.parents('.moj-multi-file-upload__row').remove();
         if (