govuk_publishing_components 17.13.0 → 17.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 458c9dcdf7dc0578315c0d5ec5c02d5e93c155625cf53f770d9d9f1706680203
-  data.tar.gz: 3f1f0afe46aff5ec70739b7dbc3cf79ef4d30eebcd5a08d7b165e27e87d113a6
+  metadata.gz: 1fae6c310eb63c511c044be1ee8cb28802b3c3d1d767d7e1878b03c819888483
+  data.tar.gz: 69ad960abde6fa565fe63c5a9e8bb2db1d82bd0b474d0403da0354923fbfa020
 SHA512:
-  metadata.gz: 9608142d53358a769f304ee17898b8cdef5d3f5676da3502533d0a5052fdf003efd4ed3ee14eaa8c99a6a40c90bf369fe71f1e8bfd524d5e11009fb0250799ae
-  data.tar.gz: 7c6765b1eb511c16fa4e74202c693b1979843a40472b43f8cb28a8dc3f8aa162a524f5d8d0ccb5d77205c03d70a74659a5b8a18e376b2ca336405991ae1c93ee
+  metadata.gz: '09bbfe08788bac9d3add154ac0baae7de48a581e4923fa99442f4ac24de638d000aa85654a230bbb01c758661de30ad63af8b937ebfac8d684fb86bfc76f97dd'
+  data.tar.gz: eab47a1574c05fb21142babbd6c51d898cc8a8809a67d05be617dbe7575a43729462f9f904e3067303693acf2dddf45ffcf3fe4703fbe4b520f8ed332ea29a2d

data/app/assets/javascripts/govuk_publishing_components/components/cookie-banner.js

@@ -11,12 +11,13 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.$module.setCookieConsent = this.setCookieConsent.bind(this)
 
     this.$module.cookieBanner = document.querySelector('.gem-c-cookie-banner')
-    this.$module.cookieBannerConfirmationMessage = document.querySelector('.gem-c-cookie-banner__confirmation')
+    this.$module.cookieBannerConfirmationMessage = this.$module.querySelector('.gem-c-cookie-banner__confirmation')
 
-    // Temporary check while we have 2 banners co-existing.
-    // Once the new banner has been deployed, we will be able to remove code relating to the old banner
-    // Separating the code out like this does mean some repetition, but will make it easier to remove later
     this.setupCookieMessage()
+
+    // Listen for cross-origin communication messages (e.g. hideCookieBanner for when previewing GOV.UK pages
+    // in publishing applications
+    this.listenForCrossOriginMessages()
   }
 
   CookieBanner.prototype.setupCookieMessage = function () {
@@ -84,5 +85,41 @@ window.GOVUK.Modules = window.GOVUK.Modules || {};
     this.$module.cookieBannerConfirmationMessage.style.display = 'block'
   }
 
+  CookieBanner.prototype.listenForCrossOriginMessages = function () {
+    window.addEventListener('message', this.receiveMessage.bind(this), false)
+  }
+
+  CookieBanner.prototype.receiveMessage = function (event) {
+    var trustedDomain = 'publishing.service.gov.uk'
+    var origin = event.origin
+
+    // Return if no origin is given or the browser doesn't support lastIndexOf
+    if (!origin || !origin.lastIndexOf) {
+      return
+    }
+
+    // Polyfill origin.endsWith(trustedDomain) for IE
+    var offset = origin.length - trustedDomain.length
+    var trustedOrigin = offset >= 0 && origin.lastIndexOf(trustedDomain, offset) === offset
+
+    // Return if the given origin is not trusted
+    if (!trustedOrigin) {
+      return
+    }
+
+    // Read JSON data from event
+    var dataObject = {}
+    try {
+      dataObject = JSON.parse(event.data)
+    } catch (err) {
+      // Don't throw errors as the emmited message may not be in a JSON format
+    } finally {
+      if (dataObject.hideCookieBanner === 'true') {
+        // Visually hide the cookie banner
+        this.$module.style.display = 'none'
+      }
+    }
+  }
+
   Modules.CookieBanner = CookieBanner
 })(window.GOVUK.Modules)

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

@@ -11,7 +11,7 @@
         <%= cb_helper.heading_markup %>
 
         <% if cb_helper.description %>
-          <%= tag.p cb_helper.description, class: "govuk-body" %>
+          <%= tag.div cb_helper.description, class: "govuk-body" %>
         <% end %>
 
         <% if cb_helper.hint_text %>

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

@@ -42,7 +42,7 @@
     <% end %>
 
     <% if description.present? %>
-      <%= tag.p description, class: "govuk-body" %>
+      <%= tag.div description, class: "govuk-body" %>
     <% end %>
 
     <% if hint %>

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '17.13.0'.freeze
+  VERSION = '17.14.0'.freeze
 end

data/node_modules/accessible-autocomplete/package.json

@@ -49,7 +49,7 @@
     "/"
   ],
   "_resolved": "git://github.com/alphagov/accessible-autocomplete.git#3523dd9fffc70cbd9f6f555f75863c33a709f49e",
-  "_shasum": "87e6ae08ea863c228e3338e9bc58a7ce2c9dd507",
+  "_shasum": "79f5e7901599aa4ed0f96da79e43f9958232ba9d",
   "_shrinkwrap": null,
   "_spec": "accessible-autocomplete@git://github.com/alphagov/accessible-autocomplete.git#add-multiselect-support",
   "_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 17.13.0
+  version: 17.14.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters