From 9a8bd56f40baa9883c33b0833d8f16c13eddf248 Mon Sep 17 00:00:00 2001 From: Patrick Cartlidge Date: Mon, 6 Nov 2023 12:10:20 +0000 Subject: [PATCH] update other components --- .../govuk_publishing_components/components/button.js | 2 +- .../govuk_publishing_components/components/character-count.js | 2 +- .../govuk_publishing_components/components/checkboxes.js | 4 +++- .../components/contextual-guidance.js | 2 ++ .../govuk_publishing_components/components/cookie-banner.js | 1 + .../components/copy-to-clipboard.js | 1 + .../govuk_publishing_components/components/details.js | 4 ++++ .../govuk_publishing_components/components/error-summary.js | 2 +- .../govuk_publishing_components/components/feedback.js | 3 +++ .../govuk_publishing_components/components/govspeak.js | 1 + .../govuk_publishing_components/components/image-card.js | 1 + .../govuk_publishing_components/components/intervention.js | 1 + .../govuk_publishing_components/components/layout-header.js | 2 +- .../components/layout-super-navigation-header.js | 2 ++ .../govuk_publishing_components/components/metadata.js | 1 + .../govuk_publishing_components/components/modal-dialogue.js | 1 + .../govuk_publishing_components/components/option-select.js | 2 ++ .../govuk_publishing_components/components/print-link.js | 1 + .../govuk_publishing_components/components/radio.js | 2 +- .../components/reorderable-list.js | 1 + .../govuk_publishing_components/components/show-password.js | 1 + .../components/single-page-notification-button.js | 2 ++ .../govuk_publishing_components/components/skip-link.js | 2 +- .../components/step-by-step-nav.js | 3 +-- .../govuk_publishing_components/components/table.js | 1 + .../govuk_publishing_components/components/tabs.js | 2 +- 26 files changed, 37 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/govuk_publishing_components/components/button.js b/app/assets/javascripts/govuk_publishing_components/components/button.js index e254f661c5..990934974b 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/button.js +++ b/app/assets/javascripts/govuk_publishing_components/components/button.js @@ -2,4 +2,4 @@ // = require dist/govuk/components/button/button.bundle.js window.GOVUK = window.GOVUK || {} window.GOVUK.Modules = window.GOVUK.Modules || {} -window.GOVUK.Modules.GovukButton = window.GOVUKFrontend.Button +window.GOVUK.Modules.GovukButton = window.GOVUKFrontend.Button.Button diff --git a/app/assets/javascripts/govuk_publishing_components/components/character-count.js b/app/assets/javascripts/govuk_publishing_components/components/character-count.js index d06628ab38..48cbbb5f20 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/character-count.js +++ b/app/assets/javascripts/govuk_publishing_components/components/character-count.js @@ -2,4 +2,4 @@ // = require dist/govuk/components/character-count/character-count.bundle.js window.GOVUK = window.GOVUK || {} window.GOVUK.Modules = window.GOVUK.Modules || {} -window.GOVUK.Modules.GovukCharacterCount = window.GOVUKFrontend.CharacterCount +window.GOVUK.Modules.GovukCharacterCount = window.GOVUKFrontend.CharacterCount.CharacterCount diff --git a/app/assets/javascripts/govuk_publishing_components/components/checkboxes.js b/app/assets/javascripts/govuk_publishing_components/components/checkboxes.js index f80cabfcaf..5a107e0a19 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/checkboxes.js +++ b/app/assets/javascripts/govuk_publishing_components/components/checkboxes.js @@ -1,13 +1,15 @@ // = require dist/govuk/components/checkboxes/checkboxes.bundle.js window.GOVUK = window.GOVUK || {} window.GOVUK.Modules = window.GOVUK.Modules || {} -window.GOVUK.Modules.GovukCheckboxes = window.GOVUKFrontend.Checkboxes; +window.GOVUK.Modules.GovukCheckboxes = window.GOVUKFrontend.Checkboxes.Checkboxes; (function (Modules) { function GemCheckboxes ($module) { this.$module = $module this.$checkboxes = this.$module.querySelectorAll('input[type=checkbox]') this.$nestedCheckboxes = this.$module.querySelectorAll('[data-nested=true] input[type=checkbox]') + + this.init(); } GemCheckboxes.prototype.init = function () { diff --git a/app/assets/javascripts/govuk_publishing_components/components/contextual-guidance.js b/app/assets/javascripts/govuk_publishing_components/components/contextual-guidance.js index 6ae776b654..2e00c6bfd3 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/contextual-guidance.js +++ b/app/assets/javascripts/govuk_publishing_components/components/contextual-guidance.js @@ -7,6 +7,8 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; this.$guidance = this.$module.querySelector('.gem-c-contextual-guidance__wrapper') this.$inputId = this.$guidance.getAttribute('for') this.$input = this.$module.querySelector('#' + this.$inputId) + + this.init(); } ContextualGuidance.prototype.init = function () { diff --git a/app/assets/javascripts/govuk_publishing_components/components/cookie-banner.js b/app/assets/javascripts/govuk_publishing_components/components/cookie-banner.js index 1e8127e67a..c1919253c9 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/cookie-banner.js +++ b/app/assets/javascripts/govuk_publishing_components/components/cookie-banner.js @@ -6,6 +6,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; this.$module = $module this.$module.cookieBannerConfirmationMessage = this.$module.querySelector('.gem-c-cookie-banner__confirmation') this.$module.cookieBannerConfirmationMessageText = this.$module.querySelector('.gem-c-cookie-banner__confirmation-message') + this.init(); } CookieBanner.prototype.init = function () { diff --git a/app/assets/javascripts/govuk_publishing_components/components/copy-to-clipboard.js b/app/assets/javascripts/govuk_publishing_components/components/copy-to-clipboard.js index 9310e4ca82..a5b8282dd1 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/copy-to-clipboard.js +++ b/app/assets/javascripts/govuk_publishing_components/components/copy-to-clipboard.js @@ -6,6 +6,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; this.$module = $module this.$input = this.$module.querySelector('.gem-c-input') this.$copyButton = this.$module.querySelector('.gem-c-button') + this.init(); } CopyToClipboard.prototype.init = function () { diff --git a/app/assets/javascripts/govuk_publishing_components/components/details.js b/app/assets/javascripts/govuk_publishing_components/components/details.js index dcd6bf98ea..33d6c5b6a9 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/details.js +++ b/app/assets/javascripts/govuk_publishing_components/components/details.js @@ -1,6 +1,10 @@ window.GOVUK = window.GOVUK || {} window.GOVUK.Modules = window.GOVUK.Modules || {} + +// this now doesn't use any JS... +// might need to reimplement this... + (function (Modules) { function GemDetails ($module) { this.$module = $module diff --git a/app/assets/javascripts/govuk_publishing_components/components/error-summary.js b/app/assets/javascripts/govuk_publishing_components/components/error-summary.js index 64f8e49db9..b82df353db 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/error-summary.js +++ b/app/assets/javascripts/govuk_publishing_components/components/error-summary.js @@ -2,4 +2,4 @@ // = require dist/govuk/components/error-summary/error-summary.bundle.js window.GOVUK = window.GOVUK || {} window.GOVUK.Modules = window.GOVUK.Modules || {} -window.GOVUK.Modules.GovukErrorSummary = window.GOVUKFrontend.ErrorSummary +window.GOVUK.Modules.GovukErrorSummary = window.GOVUKFrontend.ErrorSummary.ErrorSummary diff --git a/app/assets/javascripts/govuk_publishing_components/components/feedback.js b/app/assets/javascripts/govuk_publishing_components/components/feedback.js index 1b7912b210..a15d257266 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/feedback.js +++ b/app/assets/javascripts/govuk_publishing_components/components/feedback.js @@ -21,6 +21,8 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; this.jshiddenClass = 'js-hidden' this.whatDoingInput = this.$module.querySelector('[name=what_doing]') this.whatWrongInput = this.$module.querySelector('[name=what_wrong]') + + this.init(); } Feedback.prototype.init = function () { @@ -73,6 +75,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; } else { gaClientId = window.GOVUK.cookie('_ga').split('.').slice(-2).join('.') } + this.setHiddenValuesNotUsefulForm(gaClientId) }.bind(this)) diff --git a/app/assets/javascripts/govuk_publishing_components/components/govspeak.js b/app/assets/javascripts/govuk_publishing_components/components/govspeak.js index 505c63ba51..6024f42ec8 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/govspeak.js +++ b/app/assets/javascripts/govuk_publishing_components/components/govspeak.js @@ -4,6 +4,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; (function (Modules) { function Govspeak ($module) { this.$module = $module + this.init(); } Govspeak.prototype.init = function () { diff --git a/app/assets/javascripts/govuk_publishing_components/components/image-card.js b/app/assets/javascripts/govuk_publishing_components/components/image-card.js index aac62e987a..7d29cafddf 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/image-card.js +++ b/app/assets/javascripts/govuk_publishing_components/components/image-card.js @@ -5,6 +5,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; function ImageCard ($module) { this.$module = $module this.$module.youtubeLink = this.$module.querySelector('.gem-c-image-card__image-wrapper div') + this.init(); } ImageCard.prototype.init = function () { diff --git a/app/assets/javascripts/govuk_publishing_components/components/intervention.js b/app/assets/javascripts/govuk_publishing_components/components/intervention.js index 1ea158a31a..1b3355661f 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/intervention.js +++ b/app/assets/javascripts/govuk_publishing_components/components/intervention.js @@ -7,6 +7,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; this.$closeLink = this.$module.querySelector('.js-dismiss-link') this.$campaignName = this.$module.getAttribute('data-intervention-name') this.$campaignCookie = window.GOVUK.cookie('intervention_campaign') || '' + this.init(); } Intervention.prototype.init = function () { diff --git a/app/assets/javascripts/govuk_publishing_components/components/layout-header.js b/app/assets/javascripts/govuk_publishing_components/components/layout-header.js index 882c6127f5..2433bfe513 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/layout-header.js +++ b/app/assets/javascripts/govuk_publishing_components/components/layout-header.js @@ -2,4 +2,4 @@ // = require dist/govuk/components/header/header.bundle.js window.GOVUK = window.GOVUK || {} window.GOVUK.Modules = window.GOVUK.Modules || {} -window.GOVUK.Modules.GovukHeader = window.GOVUKFrontend.Header +window.GOVUK.Modules.GovukHeader = window.GOVUKFrontend.Header.Header diff --git a/app/assets/javascripts/govuk_publishing_components/components/layout-super-navigation-header.js b/app/assets/javascripts/govuk_publishing_components/components/layout-super-navigation-header.js index 0e898968fa..83765f4931 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/layout-super-navigation-header.js +++ b/app/assets/javascripts/govuk_publishing_components/components/layout-super-navigation-header.js @@ -104,6 +104,8 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; ) this.hiddenButtons = this.$module.querySelectorAll('button[hidden]') + + this.init(); } SuperNavigationMegaMenu.prototype.buttonHandler = function (event) { diff --git a/app/assets/javascripts/govuk_publishing_components/components/metadata.js b/app/assets/javascripts/govuk_publishing_components/components/metadata.js index 0c85703cf4..711294c20b 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/metadata.js +++ b/app/assets/javascripts/govuk_publishing_components/components/metadata.js @@ -4,6 +4,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; (function (Modules) { function Metadata ($module) { this.$module = $module + this.init(); } Metadata.prototype.init = function () { diff --git a/app/assets/javascripts/govuk_publishing_components/components/modal-dialogue.js b/app/assets/javascripts/govuk_publishing_components/components/modal-dialogue.js index 241647d07d..4a54083b2e 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/modal-dialogue.js +++ b/app/assets/javascripts/govuk_publishing_components/components/modal-dialogue.js @@ -8,6 +8,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; this.$closeButton = this.$module.querySelector('.gem-c-modal-dialogue__close-button') this.$html = document.querySelector('html') this.$body = document.querySelector('body') + this.init(); } ModalDialogue.prototype.init = function () { diff --git a/app/assets/javascripts/govuk_publishing_components/components/option-select.js b/app/assets/javascripts/govuk_publishing_components/components/option-select.js index d05c991ced..8706cd8f91 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/option-select.js +++ b/app/assets/javascripts/govuk_publishing_components/components/option-select.js @@ -74,6 +74,8 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; if (checkedString) { this.attachCheckedCounter(checkedString) } + + this.init(); } OptionSelect.prototype.toggleVisibility = function (isTabletOrLarger) { diff --git a/app/assets/javascripts/govuk_publishing_components/components/print-link.js b/app/assets/javascripts/govuk_publishing_components/components/print-link.js index 8a6bb78a86..3862dfd97d 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/print-link.js +++ b/app/assets/javascripts/govuk_publishing_components/components/print-link.js @@ -4,6 +4,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; (function (Modules) { function PrintLink ($module) { this.$module = $module + this.init(); } PrintLink.prototype.init = function () { diff --git a/app/assets/javascripts/govuk_publishing_components/components/radio.js b/app/assets/javascripts/govuk_publishing_components/components/radio.js index c896a4dd13..fa83c7829e 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/radio.js +++ b/app/assets/javascripts/govuk_publishing_components/components/radio.js @@ -3,4 +3,4 @@ window.GOVUK = window.GOVUK || {} window.GOVUK.Modules = window.GOVUK.Modules || {} -window.GOVUK.Modules.GovukRadios = window.GOVUKFrontend.Radios +window.GOVUK.Modules.GovukRadios = window.GOVUKFrontend.Radios.Radios diff --git a/app/assets/javascripts/govuk_publishing_components/components/reorderable-list.js b/app/assets/javascripts/govuk_publishing_components/components/reorderable-list.js index 8cf4d117b5..09d775b989 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/reorderable-list.js +++ b/app/assets/javascripts/govuk_publishing_components/components/reorderable-list.js @@ -7,6 +7,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; this.$module = $module this.$upButtons = this.$module.querySelectorAll('.js-reorderable-list-up') this.$downButtons = this.$module.querySelectorAll('.js-reorderable-list-down') + this.init(); } ReorderableList.prototype.init = function () { diff --git a/app/assets/javascripts/govuk_publishing_components/components/show-password.js b/app/assets/javascripts/govuk_publishing_components/components/show-password.js index 449e6e8a04..fc0d62b852 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/show-password.js +++ b/app/assets/javascripts/govuk_publishing_components/components/show-password.js @@ -5,6 +5,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; function ShowPassword ($module) { this.$module = $module this.input = this.$module.querySelector('.gem-c-input') + this.init(); } ShowPassword.prototype.init = function () { diff --git a/app/assets/javascripts/govuk_publishing_components/components/single-page-notification-button.js b/app/assets/javascripts/govuk_publishing_components/components/single-page-notification-button.js index 13faee1536..575195d8fc 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/single-page-notification-button.js +++ b/app/assets/javascripts/govuk_publishing_components/components/single-page-notification-button.js @@ -12,6 +12,8 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; this.personalisationEndpoint = '/api/personalisation/check-email-subscription?base_path=' + this.basePath // This attribute is passed through to the personalisation API to ensure the updated button has the same button_location for analytics if (this.buttonLocation) this.personalisationEndpoint += '&button_location=' + this.buttonLocation + + this.init(); } SinglePageNotificationButton.prototype.init = function () { diff --git a/app/assets/javascripts/govuk_publishing_components/components/skip-link.js b/app/assets/javascripts/govuk_publishing_components/components/skip-link.js index a9de1cf017..26211ea67b 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/skip-link.js +++ b/app/assets/javascripts/govuk_publishing_components/components/skip-link.js @@ -3,4 +3,4 @@ window.GOVUK = window.GOVUK || {} window.GOVUK.Modules = window.GOVUK.Modules || {} -window.GOVUK.Modules.GovukSkipLink = window.GOVUKFrontend.SkipLink +window.GOVUK.Modules.GovukSkipLink = window.GOVUKFrontend.SkipLink.SkipLink diff --git a/app/assets/javascripts/govuk_publishing_components/components/step-by-step-nav.js b/app/assets/javascripts/govuk_publishing_components/components/step-by-step-nav.js index b0d08d91de..0e770f3208 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/step-by-step-nav.js +++ b/app/assets/javascripts/govuk_publishing_components/components/step-by-step-nav.js @@ -1,5 +1,3 @@ - - window.GOVUK = window.GOVUK || {} window.GOVUK.Modules = window.GOVUK.Modules || {}; @@ -14,6 +12,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; this.$module.activeStepClass = 'gem-c-step-nav__step--active' this.$module.activeLinkHref = '#content' this.$module.uniqueId = false + this.init(); } Gemstepnav.prototype.init = function () { diff --git a/app/assets/javascripts/govuk_publishing_components/components/table.js b/app/assets/javascripts/govuk_publishing_components/components/table.js index b9b262ebcb..ee14ca8443 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/table.js +++ b/app/assets/javascripts/govuk_publishing_components/components/table.js @@ -16,6 +16,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}; for (var i = 0; i < this.tableRows.length; i++) { this.tableRowsContent.push(this.tableRows[i].textContent.toUpperCase()) } + this.init(); } Table.prototype.init = function () { diff --git a/app/assets/javascripts/govuk_publishing_components/components/tabs.js b/app/assets/javascripts/govuk_publishing_components/components/tabs.js index 26d5a1f3c3..7fcdcb08d6 100644 --- a/app/assets/javascripts/govuk_publishing_components/components/tabs.js +++ b/app/assets/javascripts/govuk_publishing_components/components/tabs.js @@ -3,4 +3,4 @@ window.GOVUK = window.GOVUK || {} window.GOVUK.Modules = window.GOVUK.Modules || {} -window.GOVUK.Modules.GovukTabs = window.GOVUKFrontend.Tabs +window.GOVUK.Modules.GovukTabs = window.GOVUKFrontend.Tabs.Tabs