govuk_publishing_components 24.13.3 → 24.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a35a738afbd13284b90e5ca985cb1be689e1a4fec384d36cf3618c3c9b6562c
-  data.tar.gz: f330967e05f6c5c5d41f47fb7b5205685197e483b67b0db08d27ad4efd60a796
+  metadata.gz: 48d13ec5bd03475381c42cb9e3fbdb32118e851c82a2021462994e0af0cbe042
+  data.tar.gz: 30b3eaa8d62c9fe6eab0c48b65667329e9ae99d955f584cd37009dc59daeb254
 SHA512:
-  metadata.gz: 3a3c2ab786bc602c21b2ecd225c9fe297e6dca33a146c0a135ae7f3bca839a8aecc988d061cf83d2ae607ed904c2827921fc7ecbe72a53c1a83f9660af6f1762
-  data.tar.gz: 925f4e55851084894c74b27bfd58a502e411bdbb552f0a44567724c4789bc05691d15b9c0dfd72878b62465f52dffcd0582664b844cd2c56fdae2a9d135e4de6
+  metadata.gz: 83f0878e78d24711ed4fa7694d4becac691474370c29b33b355faed6dc98b98619af4f22bb6d3bdd70a787c510d93ac3cf8659d78ff7b009a3a46bbce93a9a50
+  data.tar.gz: 919f5697fbba2e55d2709e24750af0f3d3d07836958c0a09ece0cba6a5ee8e4634e58b99230303eb6ce88f467e5a4e99ced6a3bf3de527fb7ef1b4c2e7fd344a

data/app/assets/javascripts/govuk_publishing_components/analytics/analytics.js

@@ -41,7 +41,9 @@
     // we ignore the possibility of there being campaign variables in the
     // anchor because we wouldn't know how to detect and parse them if they
     // were present
-    return this.pii.stripPIIFromString(location.href.substring(location.origin.length).split('#')[0])
+    // IE can't access window.location.origin, so we have to do this slightly complex thing
+    var root = location.protocol + '//' + location.hostname + (location.port ? ':' + location.port : '')
+    return this.pii.stripPIIFromString(location.href.substring(root.length).split('#')[0])
   }
 
   Analytics.prototype.trackPageview = function (path, title, options) {

data/app/assets/javascripts/govuk_publishing_components/analytics/custom-dimensions.js

@@ -33,6 +33,8 @@
 
     if (window.devicePixelRatio) {
       customDimensions.dimension11 = window.devicePixelRatio
+    } else {
+      customDimensions.dimension11 = window.screen.deviceXDPI / window.screen.logicalXDPI
     }
 
     return customDimensions

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

@@ -33,7 +33,9 @@ window.GOVUK.Modules.Checkboxes = window.GOVUKFrontend;
     if (window.GOVUK.analytics && window.GOVUK.analytics.trackEvent) {
       // Where checkboxes are manipulated externally in finders, `suppressAnalytics`
       // is passed to prevent duplicate GA events.
-      if (!event.detail || (event.detail && event.detail.suppressAnalytics !== true)) {
+      // use Oliver Steele's Nested Object Access Pattern https://hackernoon.com/accessing-nested-objects-in-javascript-f02f1bd6387f
+      var allowAnalytics = ((event || {}).detail || {}).suppressAnalytics !== true
+      if (allowAnalytics) {
         var $checkbox = event.target
         var category = $checkbox.getAttribute('data-track-category')
         if (category) {
@@ -100,11 +102,11 @@ window.GOVUK.Modules.Checkboxes = window.GOVUKFrontend;
     var $exclusiveOption = $checkboxes.querySelector('input[type=checkbox][data-exclusive]')
     var $nonExclusiveOptions = $checkboxes.querySelectorAll('input[type=checkbox]:not([data-exclusive])')
 
-    if ($currentCheckbox.dataset.exclusive === 'true' && $currentCheckbox.checked === true) {
+    if ($currentCheckbox.getAttribute('data-exclusive') === 'true' && $currentCheckbox.checked === true) {
       for (var i = 0; i < $nonExclusiveOptions.length; i++) {
         $nonExclusiveOptions[i].checked = false
       }
-    } else if ($currentCheckbox.dataset.exclusive !== 'true' && $currentCheckbox.checked === true) {
+    } else if ($currentCheckbox.getAttribute('data-exclusive') !== 'true' && $currentCheckbox.checked === true) {
       if ($exclusiveOption) {
         $exclusiveOption.checked = false
       }

data/app/assets/javascripts/govuk_publishing_components/components/contextual-guidance.js

@@ -15,7 +15,7 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
   ContextualGuidance.prototype.handleFocus = function (event) {
     this.hideAllGuidance()
-    if (!event.target.dataset.contextualGuidanceHideOnly) {
+    if (!event.target.getAttribute('data-contextual-guidance-hide-only')) {
       this.$guidance.style.display = 'block'
     }
   }

data/app/assets/javascripts/govuk_publishing_components/components/reorderable-list.js

@@ -26,14 +26,14 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     }
 
     var boundOnClickUpButton = this.onClickUpButton.bind(this)
-    this.$upButtons.forEach(function (button) {
-      button.addEventListener('click', boundOnClickUpButton)
-    })
+    for (var u = 0; u < this.$upButtons.length; u++) {
+      this.$upButtons[u].addEventListener('click', boundOnClickUpButton)
+    }
 
     var boundOnClickDownButton = this.onClickDownButton.bind(this)
-    this.$downButtons.forEach(function (button) {
-      button.addEventListener('click', boundOnClickDownButton)
-    })
+    for (var d = 0; d < this.$downButtons.length; d++) {
+      this.$downButtons[d].addEventListener('click', boundOnClickDownButton)
+    }
   }
 
   ReorderableList.prototype.setupResponsiveChecks = function () {
@@ -85,9 +85,9 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
 
   ReorderableList.prototype.updateOrderIndexes = function () {
     var $orderInputs = this.$module.querySelectorAll('.gem-c-reorderable-list__actions input')
-    $orderInputs.forEach(function (input, index) {
-      input.setAttribute('value', index + 1)
-    })
+    for (var i = 0; i < $orderInputs.length; i++) {
+      $orderInputs[i].setAttribute('value', i + 1)
+    }
   }
 
   ReorderableList.prototype.triggerEvent = function (element, eventName) {

data/app/assets/javascripts/govuk_publishing_components/lib/govspeak/magna-charta.js

@@ -462,11 +462,11 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     var allCharts = document.querySelectorAll('table.js-barchart-table')
     var id = null
 
-    allCharts.forEach(function (chart, i) {
-      if (chart === module) {
+    for (var i = 0; i < allCharts.length; i++) {
+      if (allCharts[i] === module) {
         id = i
       }
-    })
+    }
 
     return id
   }

data/app/assets/javascripts/govuk_publishing_components/lib/trigger-event.js

@@ -2,15 +2,17 @@
   'use strict'
   window.GOVUK = window.GOVUK || {}
 
-  window.GOVUK.triggerEvent = function (element, eventName) {
-    var params = { bubbles: true, cancelable: true }
+  window.GOVUK.triggerEvent = function (element, eventName, parameters) {
+    var params = parameters || {}
+    params.bubbles = true
+    params.cancelable = true
     var event
 
     if (typeof window.CustomEvent === 'function') {
       event = new window.CustomEvent(eventName, params)
     } else {
       event = document.createEvent('CustomEvent')
-      event.initCustomEvent(eventName, params.bubbles, params.cancelable, null)
+      event.initCustomEvent(eventName, params.bubbles, params.cancelable, params.detail)
     }
 
     element.dispatchEvent(event)

data/app/views/govuk_publishing_components/components/_government_navigation.html.erb

@@ -5,37 +5,79 @@
 <nav id="proposition-menu" class="no-proposition-name gem-c-government-navigation" aria-label="Departments and policy navigation">
   <ul id="proposition-links">
     <li>
-      <a class="<%= 'active' if active == 'departments' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/government/organisations">
+      <a class="<%= 'active' if active == 'departments' %> govuk-link govuk-link--no-underline govuk-link--inverse"
+         data-track-category="headerClicked"
+         data-track-action="departmentsLink"
+         data-track-label="/government/organisations"
+         data-track-dimension="<%= t("components.government_navigation.departments") %>"
+         data-track-dimension-index="29"
+         href="/government/organisations">
         <%= t("components.government_navigation.departments") %>
       </a>
     </li>
     <li>
-      <a class="<%= 'active' if active == 'worldwide' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/government/world">
+      <a class="<%= 'active' if active == 'worldwide' %> govuk-link govuk-link--no-underline govuk-link--inverse"
+         data-track-category="headerClicked"
+         data-track-action="worldwideLink"
+         data-track-label="/world"
+         data-track-dimension="<%= t("components.government_navigation.worldwide") %>"
+         data-track-dimension-index="29"
+         href="/world">
         <%= t("components.government_navigation.worldwide") %>
       </a>
     </li>
     <li>
-      <a class="<%= 'active' if active == 'how-government-works' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/government/how-government-works">
+      <a class="<%= 'active' if active == 'how-government-works' %> govuk-link govuk-link--no-underline govuk-link--inverse"
+         data-track-category="headerClicked"
+         data-track-action="governmentactivityLink"
+         data-track-label="/government/how-government-works"
+         data-track-dimension="<%= t("components.government_navigation.how-government-works") %>"
+         data-track-dimension-index="29"
+         href="/government/how-government-works">
         <%= t("components.government_navigation.how-government-works") %>
       </a>
     </li>
     <li>
-      <a class="<%= 'active' if active == 'get-involved' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/government/get-involved">
+      <a class="<%= 'active' if active == 'get-involved' %> govuk-link govuk-link--no-underline govuk-link--inverse"
+         data-track-category="headerClicked"
+         data-track-action="governmentactivityLink"
+         data-track-label="/government/get-involved"
+         data-track-dimension="<%= t("components.government_navigation.get-involved") %>"
+         data-track-dimension-index="29"
+         href="/government/get-involved">
         <%= t("components.government_navigation.get-involved") %>
       </a>
     </li>
     <li class="clear-child">
-      <a class="<%= 'active' if active == 'consultations' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="<%= CGI::escapeHTML('/search/policy-papers-and-consultations?content_store_document_type[]=open_consultations&content_store_document_type[]=closed_consultations') %>">
+      <a class="<%= 'active' if active == 'consultations' %> govuk-link govuk-link--no-underline govuk-link--inverse"
+         data-track-category="headerClicked"
+         data-track-action="governmentactivityLink"
+         data-track-label="/government/get-involved"
+         data-track-dimension="<%= t("components.government_navigation.consultations") %>"
+         data-track-dimension-index="29"
+         href="<%= CGI::escapeHTML('/search/policy-papers-and-consultations?content_store_document_type[]=open_consultations&content_store_document_type[]=closed_consultations') %>">
         <%= t("components.government_navigation.consultations") %>
       </a>
     </li>
     <li>
-      <a class="<%= 'active' if active == 'statistics' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/search/research-and-statistics">
+      <a class="<%= 'active' if active == 'statistics' %> govuk-link govuk-link--no-underline govuk-link--inverse"
+         data-track-category="headerClicked"
+         data-track-action="governmentactivityLink"
+         data-track-label="/government/research-and-statistics"
+         data-track-dimension="<%= t("components.government_navigation.statistics") %>"
+         data-track-dimension-index="29"
+      href="/search/research-and-statistics">
         <%= t("components.government_navigation.statistics") %>
       </a>
     </li>
     <li>
-      <a class="<%= 'active' if active == 'announcements' %> govuk-link govuk-link--no-underline govuk-link--inverse" href="/news-and-communications">
+      <a class="<%= 'active' if active == 'announcements' %> govuk-link govuk-link--no-underline govuk-link--inverse"
+         data-track-category="headerClicked"
+         data-track-action="governmentactivityLink"
+         data-track-label="/search/news-and-communications"
+         data-track-dimension="<%= t("components.government_navigation.news_and_communications") %>"
+         data-track-dimension-index="29"
+         href="/search/news-and-communications">
         <%= t("components.government_navigation.news_and_communications") %>
       </a>
     </li>

data/lib/govuk_publishing_components/presenters/content_breadcrumbs_based_on_priority.rb

@@ -11,6 +11,12 @@ module GovukPublishingComponents
         transition_period: "d6c2de5d-ef90-45d1-82d4-5f2438369eea",
       }.freeze
 
+      BREXIT_TAXONS = {
+        brexit: "d6c2de5d-ef90-45d1-82d4-5f2438369eea",
+        brexit_business: "634fd193-8039-4a70-a059-919c34ff4bfc",
+        brexit_citizen: "614b2e65-56ac-4f8d-bb9c-d1a14167ba25",
+      }.freeze
+
       # Returns the highest priority taxon that has a content_id matching those in PRIORITY_TAXONS
       def self.call(content_item, query_parameters = nil)
         new(content_item, query_parameters).breadcrumbs
@@ -35,7 +41,7 @@ module GovukPublishingComponents
           title: taxon["title"],
           path: taxon["base_path"],
           tracking_category: "breadcrumbClicked",
-          tracking_action: "superBreadcrumb",
+          tracking_action: tracking_action,
           tracking_label: content_item["base_path"],
           tracking_dimension_enabled: false,
         }
@@ -71,6 +77,14 @@ module GovukPublishingComponents
       def preferred_priority_taxon
         query_parameters["priority-taxon"] if query_parameters
       end
+
+      def tracking_action
+        action = %w[superBreadcrumb]
+        action << "Brexitbusiness" if taxon["content_id"] == BREXIT_TAXONS[:brexit_business]
+        action << "Brexitcitizen" if taxon["content_id"] == BREXIT_TAXONS[:brexit_business]
+        action << "Brexitbusinessandcitizen" if taxon["content_id"] == BREXIT_TAXONS[:brexit]
+        action.join(" ")
+      end
     end
   end
 end

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = "24.13.3".freeze
+  VERSION = "24.13.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 24.13.3
+  version: 24.13.4
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2021-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: govuk_app_config