@ministryofjustice/frontend 3.6.1 → 3.6.2

package/moj/all.js

@@ -5,7 +5,7 @@
 })(this, (function (exports) { 'use strict';
 
   function AddAnother(container) {
-    this.container = window.jQuery(container);
+    this.container = $(container);
 
     if (this.container.data('moj-add-another-initialised')) {
       return
@@ -16,12 +16,12 @@
     this.container.on(
       'click',
       '.moj-add-another__remove-button',
-      window.jQuery.proxy(this, 'onRemoveButtonClick')
+      $.proxy(this, 'onRemoveButtonClick')
     );
     this.container.on(
       'click',
       '.moj-add-another__add-button',
-      window.jQuery.proxy(this, 'onAddButtonClick')
+      $.proxy(this, 'onAddButtonClick')
     );
     this.container
       .find('.moj-add-another__add-button, moj-add-another__remove-button')
@@ -60,16 +60,16 @@
     item.find('[data-name]').each(function (i, el) {
       const originalId = el.id;
 
-      el.name = window.jQuery(el)
+      el.name = $(el)
         .attr('data-name')
         .replace(/%index%/, index);
-      el.id = window.jQuery(el)
+      el.id = $(el)
         .attr('data-id')
         .replace(/%index%/, index);
 
       const label =
-        window.jQuery(el).siblings('label')[0] ||
-        window.jQuery(el).parents('label')[0] ||
+        $(el).siblings('label')[0] ||
+        $(el).parents('label')[0] ||
         item.find(`[for="${originalId}"]`)[0];
       label.htmlFor = el.id;
     });
@@ -92,14 +92,14 @@
   };
 
   AddAnother.prototype.onRemoveButtonClick = function (e) {
-    window.jQuery(e.currentTarget).parents('.moj-add-another__item').remove();
+    $(e.currentTarget).parents('.moj-add-another__item').remove();
     const items = this.getItems();
     if (items.length === 1) {
       items.find('.moj-add-another__remove-button').remove();
     }
     items.each(
-      window.jQuery.proxy(function (index, el) {
-        this.updateAttributes(index, window.jQuery(el));
+      $.proxy(function (index, el) {
+        this.updateAttributes(index, $(el));
       }, this)
     );
     this.focusHeading();
@@ -1769,8 +1769,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();
@@ -1782,15 +1782,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);
   };
 
@@ -1814,11 +1814,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);
     }
   };
 
@@ -1865,17 +1865,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');
 
@@ -1889,20 +1889,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(
@@ -1913,13 +1913,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);
@@ -1952,7 +1952,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();
   };
@@ -1993,18 +1993,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')
@@ -2021,7 +2021,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,
@@ -2052,15 +2052,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 (
@@ -2076,7 +2076,7 @@
   };
 
   function MultiSelect(options) {
-    this.container = window.jQuery(options.container);
+    this.container = $(options.container);
 
     if (this.container.data('moj-multi-select-initialised')) {
       return
@@ -2090,12 +2090,12 @@
       allId = `${idPrefix}checkboxes-all`;
     }
 
-    this.toggle = window.jQuery(this.getToggleHtml(allId));
+    this.toggle = $(this.getToggleHtml(allId));
     this.toggleButton = this.toggle.find('input');
-    this.toggleButton.on('click', window.jQuery.proxy(this, 'onButtonClick'));
+    this.toggleButton.on('click', $.proxy(this, 'onButtonClick'));
     this.container.append(this.toggle);
-    this.checkboxes = window.jQuery(options.checkboxes);
-    this.checkboxes.on('click', window.jQuery.proxy(this, 'onCheckboxClick'));
+    this.checkboxes = $(options.checkboxes);
+    this.checkboxes.on('click', $.proxy(this, 'onCheckboxClick'));
     this.checked = options.checked || false;
   }
 
@@ -2123,7 +2123,7 @@
 
   MultiSelect.prototype.checkAll = function () {
     this.checkboxes.each(
-      window.jQuery.proxy(function (index, el) {
+      $.proxy(function (index, el) {
         el.checked = true;
       }, this)
     );
@@ -2132,7 +2132,7 @@
 
   MultiSelect.prototype.uncheckAll = function () {
     this.checkboxes.each(
-      window.jQuery.proxy(function (index, el) {
+      $.proxy(function (index, el) {
         el.checked = false;
       }, this)
     );
@@ -2153,7 +2153,7 @@
 
   function PasswordReveal(element) {
     this.el = element;
-    const $el = window.jQuery(this.el);
+    const $el = $(this.el);
 
     if ($el.data('moj-password-reveal-initialised')) {
       return
@@ -2163,16 +2163,16 @@
     $el.attr('spellcheck', 'false');
 
     $el.wrap('<div class="moj-password-reveal"></div>');
-    this.container = window.jQuery(this.el).parent();
+    this.container = $(this.el).parent();
     this.createButton();
   }
 
   PasswordReveal.prototype.createButton = function () {
-    this.button = window.jQuery(
+    this.button = $(
       '<button type="button" class="govuk-button govuk-button--secondary moj-password-reveal__button">Show <span class="govuk-visually-hidden">password</span></button>'
     );
     this.container.append(this.button);
-    this.button.on('click', window.jQuery.proxy(this, 'onButtonClick'));
+    this.button.on('click', $.proxy(this, 'onButtonClick'));
   };
 
   PasswordReveal.prototype.onButtonClick = function () {
@@ -2199,7 +2199,7 @@
       numbers: true
     };
     this.textarea = this.options.textarea;
-    this.container = window.jQuery(this.textarea).parent();
+    this.container = $(this.textarea).parent();
 
     if (this.container.data('moj-rich-text-editor-initialised')) {
       return
@@ -2219,13 +2219,13 @@
     this.container.on(
       'click',
       '.moj-rich-text-editor__toolbar-button',
-      window.jQuery.proxy(this, 'onButtonClick')
+      $.proxy(this, 'onButtonClick')
     );
     this.container
       .find('.moj-rich-text-editor__content')
-      .on('input', window.jQuery.proxy(this, 'onEditorInput'));
-    this.container.find('label').on('click', window.jQuery.proxy(this, 'onLabelClick'));
-    this.toolbar.on('keydown', window.jQuery.proxy(this, 'onToolbarKeydown'));
+      .on('input', $.proxy(this, 'onEditorInput'));
+    this.container.find('label').on('click', $.proxy(this, 'onLabelClick'));
+    this.toolbar.on('keydown', $.proxy(this, 'onToolbarKeydown'));
   }
 
   RichTextEditor.prototype.onToolbarKeydown = function (e) {
@@ -2320,7 +2320,7 @@
   };
 
   RichTextEditor.prototype.onButtonClick = function (e) {
-    document.execCommand(window.jQuery(e.currentTarget).data('command'), false, null);
+    document.execCommand($(e.currentTarget).data('command'), false, null);
   };
 
   RichTextEditor.prototype.getContent = function () {
@@ -2343,8 +2343,8 @@
 
   function SearchToggle(options) {
     this.options = options;
-    this.container = window.jQuery(this.options.search.container);
-    this.toggleButtonContainer = window.jQuery(this.options.toggleButton.container);
+    this.container = $(this.options.search.container);
+    this.toggleButtonContainer = $(this.options.toggleButton.container);
 
     if (this.container.data('moj-search-toggle-initialised')) {
       return
@@ -2355,15 +2355,15 @@
     const svg =
       '<svg viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" class="moj-search-toggle__button__icon"><path d="M7.433,12.5790048 C6.06762625,12.5808611 4.75763941,12.0392925 3.79217348,11.0738265 C2.82670755,10.1083606 2.28513891,8.79837375 2.28699522,7.433 C2.28513891,6.06762625 2.82670755,4.75763941 3.79217348,3.79217348 C4.75763941,2.82670755 6.06762625,2.28513891 7.433,2.28699522 C8.79837375,2.28513891 10.1083606,2.82670755 11.0738265,3.79217348 C12.0392925,4.75763941 12.5808611,6.06762625 12.5790048,7.433 C12.5808611,8.79837375 12.0392925,10.1083606 11.0738265,11.0738265 C10.1083606,12.0392925 8.79837375,12.5808611 7.433,12.5790048 L7.433,12.5790048 Z M14.293,12.579 L13.391,12.579 L13.071,12.269 C14.2300759,10.9245158 14.8671539,9.20813198 14.866,7.433 C14.866,3.32786745 11.5381325,-1.65045755e-15 7.433,-1.65045755e-15 C3.32786745,-1.65045755e-15 -1.65045755e-15,3.32786745 -1.65045755e-15,7.433 C-1.65045755e-15,11.5381325 3.32786745,14.866 7.433,14.866 C9.208604,14.8671159 10.9253982,14.2296624 12.27,13.07 L12.579,13.39 L12.579,14.294 L18.296,20 L20,18.296 L14.294,12.579 L14.293,12.579 Z"></path></svg>';
 
-    this.toggleButton = window.jQuery(
+    this.toggleButton = $(
       `<button class="moj-search-toggle__button" type="button" aria-haspopup="true" aria-expanded="false">
       ${this.options.toggleButton.text} ${svg}
     </button>`
     );
-    this.toggleButton.on('click', window.jQuery.proxy(this, 'onToggleButtonClick'));
+    this.toggleButton.on('click', $.proxy(this, 'onToggleButtonClick'));
     this.toggleButtonContainer.append(this.toggleButton);
-    window.jQuery(document).on('click', this.onDocumentClick.bind(this));
-    window.jQuery(document).on('focusin', this.onDocumentClick.bind(this));
+    $(document).on('click', this.onDocumentClick.bind(this));
+    $(document).on('focusin', this.onDocumentClick.bind(this));
   }
 
   SearchToggle.prototype.showMenu = function () {
@@ -2387,15 +2387,15 @@
 
   SearchToggle.prototype.onDocumentClick = function (e) {
     if (
-      !window.jQuery.contains(this.toggleButtonContainer[0], e.target) &&
-      !window.jQuery.contains(this.container[0], e.target)
+      !$.contains(this.toggleButtonContainer[0], e.target) &&
+      !$.contains(this.container[0], e.target)
     ) {
       this.hideMenu();
     }
   };
 
   function SortableTable(params) {
-    this.table = window.jQuery(params.table);
+    this.table = $(params.table);
 
     if (this.table.data('moj-search-toggle-initialised')) {
       return
@@ -2408,7 +2408,7 @@
     this.createHeadingButtons();
     this.createStatusBox();
     this.initialiseSortedColumn();
-    this.table.on('click', 'th button', window.jQuery.proxy(this, 'onSortButtonClick'));
+    this.table.on('click', 'th button', $.proxy(this, 'onSortButtonClick'));
   }
 
   SortableTable.prototype.setupOptions = function (params) {
@@ -2422,7 +2422,7 @@
     const headings = this.table.find('thead th');
     let heading;
     for (let i = 0; i < headings.length; i++) {
-      heading = window.jQuery(headings[i]);
+      heading = $(headings[i]);
       if (heading.attr('aria-sort')) {
         this.createHeadingButton(heading, i);
       }
@@ -2431,13 +2431,13 @@
 
   SortableTable.prototype.createHeadingButton = function (heading, i) {
     const text = heading.text();
-    const button = window.jQuery(`<button type="button" data-index="${i}">${text}</button>`);
+    const button = $(`<button type="button" data-index="${i}">${text}</button>`);
     heading.text('');
     heading.append(button);
   };
 
   SortableTable.prototype.createStatusBox = function () {
-    this.status = window.jQuery(
+    this.status = $(
       '<div aria-live="polite" role="status" aria-atomic="true" class="govuk-visually-hidden" />'
     );
     this.table.parent().append(this.status);
@@ -2451,8 +2451,8 @@
       .filter('[aria-sort="ascending"], [aria-sort="descending"]')
       .first()
       .each((index, el) => {
-        const sortDirection = window.jQuery(el).attr('aria-sort');
-        const columnNumber = window.jQuery(el).find('button').attr('data-index');
+        const sortDirection = $(el).attr('aria-sort');
+        const columnNumber = $(el).find('button').attr('data-index');
         const sortedRows = this.sort(rows, columnNumber, sortDirection);
         this.addRows(sortedRows);
       });
@@ -2460,7 +2460,7 @@
 
   SortableTable.prototype.onSortButtonClick = function (e) {
     const columnNumber = e.currentTarget.getAttribute('data-index');
-    const sortDirection = window.jQuery(e.currentTarget).parent().attr('aria-sort');
+    const sortDirection = $(e.currentTarget).parent().attr('aria-sort');
     let newSortDirection;
     if (sortDirection === 'none' || sortDirection === 'descending') {
       newSortDirection = 'ascending';
@@ -2471,7 +2471,7 @@
     const sortedRows = this.sort(rows, columnNumber, newSortDirection);
     this.addRows(sortedRows);
     this.removeButtonStates();
-    this.updateButtonState(window.jQuery(e.currentTarget), newSortDirection);
+    this.updateButtonState($(e.currentTarget), newSortDirection);
   };
 
   SortableTable.prototype.updateButtonState = function (button, direction) {
@@ -2504,8 +2504,8 @@
   SortableTable.prototype.sort = function (rows, columnNumber, sortDirection) {
     const newRows = rows.sort(
       function (rowA, rowB) {
-        const tdA = window.jQuery(rowA).find('td,th').eq(columnNumber);
-        const tdB = window.jQuery(rowB).find('td,th').eq(columnNumber);
+        const tdA = $(rowA).find('td,th').eq(columnNumber);
+        const tdB = $(rowB).find('td,th').eq(columnNumber);
 
         const valueA =
           sortDirection === 'ascending'
@@ -2531,7 +2531,7 @@
     return isNaN(valAsNumber) ? val : valAsNumber
   };
 
-  const version = '3.6.1';
+  const version = '3.6.2';
 
   /* eslint-disable no-new */
 
@@ -2580,7 +2580,7 @@
 
     nodeListForEach($richTextEditors, function ($richTextEditor) {
       const options = {
-        textarea: window.jQuery($richTextEditor)
+        textarea: $($richTextEditor)
       };
 
       const toolbarAttr = $richTextEditor.getAttribute(
@@ -2607,11 +2607,11 @@
     nodeListForEach($searchToggles, function ($searchToggle) {
       new SearchToggle({
         toggleButton: {
-          container: window.jQuery($searchToggle.querySelector('.moj-search-toggle__toggle')),
+          container: $($searchToggle.querySelector('.moj-search-toggle__toggle')),
           text: $searchToggle.getAttribute('data-moj-search-toggle-text')
         },
         search: {
-          container: window.jQuery($searchToggle.querySelector('.moj-search'))
+          container: $($searchToggle.querySelector('.moj-search'))
         }
       });
     });

package/moj/all.mjs

@@ -59,7 +59,7 @@ function initAll(options) {
 
   nodeListForEach($richTextEditors, function ($richTextEditor) {
     const options = {
-      textarea: window.jQuery($richTextEditor)
+      textarea: $($richTextEditor)
     };
 
     const toolbarAttr = $richTextEditor.getAttribute(
@@ -86,11 +86,11 @@ function initAll(options) {
   nodeListForEach($searchToggles, function ($searchToggle) {
     new SearchToggle({
       toggleButton: {
-        container: window.jQuery($searchToggle.querySelector('.moj-search-toggle__toggle')),
+        container: $($searchToggle.querySelector('.moj-search-toggle__toggle')),
         text: $searchToggle.getAttribute('data-moj-search-toggle-text')
       },
       search: {
-        container: window.jQuery($searchToggle.querySelector('.moj-search'))
+        container: $($searchToggle.querySelector('.moj-search'))
       }
     });
   });

package/moj/components/add-another/add-another.js

@@ -5,7 +5,7 @@
 })(this, (function (exports) { 'use strict';
 
   function AddAnother(container) {
-    this.container = window.jQuery(container);
+    this.container = $(container);
 
     if (this.container.data('moj-add-another-initialised')) {
       return
@@ -16,12 +16,12 @@
     this.container.on(
       'click',
       '.moj-add-another__remove-button',
-      window.jQuery.proxy(this, 'onRemoveButtonClick')
+      $.proxy(this, 'onRemoveButtonClick')
     );
     this.container.on(
       'click',
       '.moj-add-another__add-button',
-      window.jQuery.proxy(this, 'onAddButtonClick')
+      $.proxy(this, 'onAddButtonClick')
     );
     this.container
       .find('.moj-add-another__add-button, moj-add-another__remove-button')
@@ -60,16 +60,16 @@
     item.find('[data-name]').each(function (i, el) {
       const originalId = el.id;
 
-      el.name = window.jQuery(el)
+      el.name = $(el)
         .attr('data-name')
         .replace(/%index%/, index);
-      el.id = window.jQuery(el)
+      el.id = $(el)
         .attr('data-id')
         .replace(/%index%/, index);
 
       const label =
-        window.jQuery(el).siblings('label')[0] ||
-        window.jQuery(el).parents('label')[0] ||
+        $(el).siblings('label')[0] ||
+        $(el).parents('label')[0] ||
         item.find(`[for="${originalId}"]`)[0];
       label.htmlFor = el.id;
     });
@@ -92,14 +92,14 @@
   };
 
   AddAnother.prototype.onRemoveButtonClick = function (e) {
-    window.jQuery(e.currentTarget).parents('.moj-add-another__item').remove();
+    $(e.currentTarget).parents('.moj-add-another__item').remove();
     const items = this.getItems();
     if (items.length === 1) {
       items.find('.moj-add-another__remove-button').remove();
     }
     items.each(
-      window.jQuery.proxy(function (index, el) {
-        this.updateAttributes(index, window.jQuery(el));
+      $.proxy(function (index, el) {
+        this.updateAttributes(index, $(el));
       }, this)
     );
     this.focusHeading();

package/moj/components/add-another/add-another.mjs

@@ -1,5 +1,5 @@
 function AddAnother(container) {
-  this.container = window.jQuery(container);
+  this.container = $(container);
 
   if (this.container.data('moj-add-another-initialised')) {
     return
@@ -10,12 +10,12 @@ function AddAnother(container) {
   this.container.on(
     'click',
     '.moj-add-another__remove-button',
-    window.jQuery.proxy(this, 'onRemoveButtonClick')
+    $.proxy(this, 'onRemoveButtonClick')
   );
   this.container.on(
     'click',
     '.moj-add-another__add-button',
-    window.jQuery.proxy(this, 'onAddButtonClick')
+    $.proxy(this, 'onAddButtonClick')
   );
   this.container
     .find('.moj-add-another__add-button, moj-add-another__remove-button')
@@ -54,16 +54,16 @@ AddAnother.prototype.updateAttributes = function (index, item) {
   item.find('[data-name]').each(function (i, el) {
     const originalId = el.id;
 
-    el.name = window.jQuery(el)
+    el.name = $(el)
       .attr('data-name')
       .replace(/%index%/, index);
-    el.id = window.jQuery(el)
+    el.id = $(el)
       .attr('data-id')
       .replace(/%index%/, index);
 
     const label =
-      window.jQuery(el).siblings('label')[0] ||
-      window.jQuery(el).parents('label')[0] ||
+      $(el).siblings('label')[0] ||
+      $(el).parents('label')[0] ||
       item.find(`[for="${originalId}"]`)[0];
     label.htmlFor = el.id;
   });
@@ -86,14 +86,14 @@ AddAnother.prototype.resetItem = function (item) {
 };
 
 AddAnother.prototype.onRemoveButtonClick = function (e) {
-  window.jQuery(e.currentTarget).parents('.moj-add-another__item').remove();
+  $(e.currentTarget).parents('.moj-add-another__item').remove();
   const items = this.getItems();
   if (items.length === 1) {
     items.find('.moj-add-another__remove-button').remove();
   }
   items.each(
-    window.jQuery.proxy(function (index, el) {
-      this.updateAttributes(index, window.jQuery(el));
+    $.proxy(function (index, el) {
+      this.updateAttributes(index, $(el));
     }, this)
   );
   this.focusHeading();