govuk_publishing_components 38.3.0 → 38.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a962544f5f3b684f7f946008d73fc0c4d266147adeb86761b2fafbdf9f77713
-  data.tar.gz: 3c14a82d4308f941d8dc7ac0990c8a504b1ada7dcd84666b2140a4bcdba01b79
+  metadata.gz: b4722ee8913bce56729719e8dde26b88d7958e23fd8c6177a12bcfb67b91a0c6
+  data.tar.gz: 77afa0a3c76a84f04523dbd435d18dc92feb1615a106efe301e3e9e78f743c69
 SHA512:
-  metadata.gz: 2b237ac3408f80f1fd42d810e48a8d30e164d0fbd61b0e1e8314bf16d4b6e17809a0d3dc5a0c4ee4dbb4369a80f402244ed5ff6201779426e02e459c416567fe
-  data.tar.gz: 7c74c53993d223235c04646f52f5e894f077486ce04d7cf82ddedf73b3e0800d225ea69b75cb0516a6bdfa0c6bdabe1690594aef0643d55b1c1b88cc8db98960
+  metadata.gz: 8861808afb26f285beb8cf3c8a91bd19a7cf076b44a784bf6da5167e24e10c643eb744bd5c0b87cbaf65c358d525a81441fd25d477e14c16b7233428b2fd7e61
+  data.tar.gz: 4baa708a0bede0ac54705a63d0fc2bc2a8d957ccae3d4b59b35e2dd8fa75ce62db1e4a7b0c4f6bedbf3c3e1751878732112b0fef1beba648a2a5d4a3abf5287b

data/app/assets/javascripts/govuk_publishing_components/components/feedback.js

@@ -26,7 +26,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
   Feedback.prototype.init = function () {
     this.setInitialAriaAttributes()
     this.setHiddenValues()
-
+    this.setSurveyPath()
     this.prompt.hidden = false
     for (var k = 0; k < this.promptQuestions.length; k++) {
       this.promptQuestions[k].hidden = false
@@ -151,6 +151,21 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.somethingIsWrongForm.appendChild(this.timerHoneyPot)
   }
 
+  // This getter is needed for spyOn in tests
+  Feedback.prototype.getPagePath = function () {
+    return window.location.pathname
+  }
+
+  Feedback.prototype.setSurveyPath = function () {
+    var surveyLink = this.$module.querySelector('#survey_explanation a')
+
+    if (surveyLink) {
+      var pathWithoutEmailPII = this.getPagePath().replace(/[^\s=?&]+(?:@|%40)[^\s=?&]+/, '[email]')
+      var encodedPath = encodeURI(pathWithoutEmailPII)
+      surveyLink.setAttribute('href', 'https://www.smartsurvey.co.uk/s/gov-uk-banner/?c=' + encodedPath)
+    }
+  }
+
   Feedback.prototype.updateAriaAttributes = function (linkClicked) {
     linkClicked.setAttribute('aria-expanded', true)
   }
@@ -161,8 +176,10 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.prompt.hidden ? this.prompt.hidden = false : this.prompt.hidden = true
 
     if (!this.activeForm.hidden) {
-      this.activeForm.querySelectorAll('.gem-c-textarea .govuk-textarea, .gem-c-input.govuk-input')[0]
-        .focus()
+      var input = this.activeForm.querySelectorAll('.gem-c-textarea .govuk-textarea, .gem-c-input.govuk-input')
+      if (input.length > 0) {
+        input[0].focus()
+      }
     } else {
       this.activeForm = false
       clearInterval(this.timerInterval)

data/app/views/govuk_publishing_components/components/feedback/_survey_signup_form.html.erb

@@ -10,7 +10,7 @@
       <h3 class="gem-c-feedback__form-heading"><%= t("components.feedback.help_us_improve_govuk") %></h3>
       <p id="survey_explanation" class="gem-c-feedback__form-paragraph">
         <%= t("components.feedback.more_about_visit") %>
-        <a href="https://www.smartsurvey.co.uk/s/gov-uk-banner/?c=<%= path_without_pii %>" class="govuk-link">Please fill in this survey</a>.
+        <a href="https://www.smartsurvey.co.uk/s/gov-uk-banner/?c=no-js" class="govuk-link" target="_blank" rel="noopener noreferrer external">Please fill in this survey (opens in a new tab)</a>.
       </p>
       <button
         class="govuk-button govuk-button--secondary js-close-form"

data/app/views/govuk_publishing_components/components/metadata/_sentence.html.erb

@@ -7,7 +7,7 @@
   end
 %>
 <% if remaining.any? %>
-  <%= items.to_sentence(last_word_connector: ', ').html_safe %>
+  <%= items.to_sentence(last_word_connector: ' and ').html_safe %>
   <div class="gem-c-metadata__toggle-wrap govuk-!-display-none-print">
     <a href="#"
        class="gem-c-metadata__definition-link govuk-!-display-none-print"
@@ -21,5 +21,5 @@
   </div>
   <span id="toggle-<%= toggle_id %>" class="gem-c-metadata__toggle-items js-hidden"><%= remaining.to_sentence.html_safe %></span>
 <% else %>
-  <%= items.to_sentence.html_safe %>
+  <%= items.to_sentence(last_word_connector: ' and ').html_safe %>
 <% end %>

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "38.3.0".freeze
+  VERSION = "38.3.2".freeze
 end

data/node_modules/axe-core/README.md

@@ -103,9 +103,9 @@ or equivalently:
 
 This will create a new build for axe, called `axe.<lang>.js` and `axe.<lang>.min.js`. If you want to build all localized versions, simply pass in `--all-lang` instead. If you want to build multiple localized versions (but not all of them), you can pass in a comma-separated list of languages to the `--lang` flag, like `--lang=nl,ja`.
 
-To create a new translation for axe, start by running `grunt translate --lang=<langcode>`. This will create a json file fin the `./locales` directory, with the default English text in it for you to translate. Alternatively, you could copy `./locales/_template.json`. We welcome any localization for axe-core. For details on how to contribute, see the Contributing section below. For details on the message syntax, see [Check Message Template](/doc/check-message-template.md).
+To create a new translation for axe, start by running `grunt translate --lang=<langcode>`. This will create a json file in the `./locales` directory, with the default English text in it for you to translate. Alternatively, you could copy `./locales/_template.json`. We welcome any localization for axe-core. For details on how to contribute, see the Contributing section below. For details on the message syntax, see [Check Message Template](/doc/check-message-template.md).
 
-To update existing translation file, re-run `grunt translate --lang=<langcode>`. This will add new messages used in English and remove messages which were not used in English.
+To update an existing translation file, re-run `grunt translate --lang=<langcode>`. This will add new messages used in English and remove messages which were not used in English.
 
 Additionally, locale can be applied at runtime by passing a `locale` object to `axe.configure()`. The locale object must be of the same shape as existing locales in the `./locales` directory. For example: