govuk_publishing_components 17.1.0 → 17.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdff9dda5418e5d8d7f623c9fc4b3b94a295a82596b321152c6864c947bab8a4
-  data.tar.gz: 1c8f0eb15da82343cebf689fd158b5a1279772353778798d5dc888958f1db7d3
+  metadata.gz: 67ef1e7cfae1f60d9524d55cc3634ac8b6c6f681869c0505b1cc5e848d649976
+  data.tar.gz: 51361825126e2e44b7f553dcca8c4f18e6bb28d122e8ccf6aa921824258edb27
 SHA512:
-  metadata.gz: 7e8000957b8665357cb95acab25a73187e89b6d1afe747be4964ad975806858eed0543dcbdf14618aa49c2eecad8ed8f4e02f2c56c675e59c733fe204d48d4dd
-  data.tar.gz: 317bd5e756d44f0819566ace557a744835cd95f654d11770f4e339ad22cef530fbe6e173eeed34d1b3b6c1bb3bfea22fcdf42291dfe31fff192ed1cd2040d0ba
+  metadata.gz: c4a98672525cc574a6d860b3e25d5bb0709aa24b0ab7b79ba9fb0599b5956f1879f6a4b36efad1bcf613849bfefb9cbf67aa4fef4d7977af180c9788ff2f4381
+  data.tar.gz: 62f47a6a27a24894c85f1cb95b2b0ca39068a3a16ce28f713941f925a8915a13018b54f0ddf93a04ef295c6f5b180a81ef712f5aea75d8d21e913aad586a33cc

data/app/assets/javascripts/govuk_publishing_components/lib/cookie-functions.js

@@ -122,12 +122,12 @@
     window.GOVUK.setCookie('cookie_policy', JSON.stringify(cookieConsent))
   }
 
-  window.GOVUK.checkConsentCookieCategory = function (cookieCategory) {
+  window.GOVUK.checkConsentCookieCategory = function (cookieName, cookieCategory) {
     var currentConsentCookie = window.GOVUK.getConsentCookie()
 
-    // If the consent cookie doesn't exist, set the default consent cookie
-    if (!currentConsentCookie) {
-      window.GOVUK.setDefaultConsentCookie()
+    // If the consent cookie doesn't exist, but the cookie is in our known list, return true
+    if (!currentConsentCookie && COOKIE_CATEGORIES[cookieName]) {
+      return true
     }
 
     currentConsentCookie = window.GOVUK.getConsentCookie()
@@ -142,8 +142,6 @@
   }
 
   window.GOVUK.checkConsentCookie = function (cookieName, cookieValue) {
-    var currentConsentCookie = window.GOVUK.getConsentCookie()
-
     // If we're setting the consent cookie OR deleting a cookie, allow by default
     if (cookieName === 'cookie_policy' || (cookieValue === null || cookieValue === false)) {
       return true
@@ -151,18 +149,13 @@
 
     // Survey cookies are dynamically generated, so we need to check for these separately
     if (cookieName.match('^govuk_surveySeen') || cookieName.match('^govuk_taken')) {
-      return window.GOVUK.checkConsentCookieCategory('essential')
-    }
-
-    // If the consent cookie doesn't exist, set the default consent cookie
-    if (!currentConsentCookie && COOKIE_CATEGORIES[cookieName]) {
-      return true
+      return window.GOVUK.checkConsentCookieCategory(cookieName, 'essential')
     }
 
     if (COOKIE_CATEGORIES[cookieName]) {
       var cookieCategory = COOKIE_CATEGORIES[cookieName]
 
-      return window.GOVUK.checkConsentCookieCategory(cookieCategory)
+      return window.GOVUK.checkConsentCookieCategory(cookieName, cookieCategory)
     } else {
       // Deny the cookie if it is not known to us
       return false

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

@@ -2,26 +2,21 @@
   id ||= "modal-dialogue-#{SecureRandom.hex(4)}"
   wide ||= false
   data_attributes = {}
-%>
-
-<%
   dialog_classes = ["gem-c-modal-dialogue__box"]
   dialog_classes << "gem-c-modal-dialogue__box--wide" if wide
 %>
 
-<div class="gem-c-modal-dialogue" data-module="modal-dialogue" id="<%= id %>">
-  <div class="gem-c-modal-dialogue__overlay"></div>
-  <%= tag.dialog class: dialog_classes, data: data_attributes, :"aria-modal" => true, role: "dialogue", tabindex: 0 do %>
-    <div class="gem-c-modal-dialogue__header">
+<%= tag.div class: "gem-c-modal-dialogue", data: { module: "modal-dialogue" }, id: id do %>
+  <%= tag.div class: "gem-c-modal-dialogue__overlay" %>
+  <%= tag.dialog class: dialog_classes, data: data_attributes, aria: { modal: true }, role: "dialog", tabindex: 0 do %>
+    <%= tag.div class: "gem-c-modal-dialogue__header" do %>
       <svg role="presentation" focusable="false" class="gem-c-modal-dialogue__logotype-crown" xmlns="http://www.w3.org/2000/svg" viewbox="0 0 132 97" height="26" width="30">
         <path fill="currentColor" fill-rule="evenodd"
           d="M25 30.2c3.5 1.5 7.7-.2 9.1-3.7 1.5-3.6-.2-7.8-3.9-9.2-3.6-1.4-7.6.3-9.1 3.9-1.4 3.5.3 7.5 3.9 9zM9 39.5c3.6 1.5 7.8-.2 9.2-3.7 1.5-3.6-.2-7.8-3.9-9.1-3.6-1.5-7.6.2-9.1 3.8-1.4 3.5.3 7.5 3.8 9zM4.4 57.2c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.5-1.5-7.6.3-9.1 3.8-1.4 3.5.3 7.6 3.9 9.1zm38.3-21.4c3.5 1.5 7.7-.2 9.1-3.8 1.5-3.6-.2-7.7-3.9-9.1-3.6-1.5-7.6.3-9.1 3.8-1.3 3.6.4 7.7 3.9 9.1zm64.4-5.6c-3.6 1.5-7.8-.2-9.1-3.7-1.5-3.6.2-7.8 3.8-9.2 3.6-1.4 7.7.3 9.2 3.9 1.3 3.5-.4 7.5-3.9 9zm15.9 9.3c-3.6 1.5-7.7-.2-9.1-3.7-1.5-3.6.2-7.8 3.7-9.1 3.6-1.5 7.7.2 9.2 3.8 1.5 3.5-.3 7.5-3.8 9zm4.7 17.7c-3.6 1.5-7.8-.2-9.2-3.8-1.5-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.3 3.5-.4 7.6-3.9 9.1zM89.3 35.8c-3.6 1.5-7.8-.2-9.2-3.8-1.4-3.6.2-7.7 3.9-9.1 3.6-1.5 7.7.3 9.2 3.8 1.4 3.6-.3 7.7-3.9 9.1zM69.7 17.7l8.9 4.7V9.3l-8.9 2.8c-.2-.3-.5-.6-.9-.9L72.4 0H59.6l3.5 11.2c-.3.3-.6.5-.9.9l-8.8-2.8v13.1l8.8-4.7c.3.3.6.7.9.9l-5 15.4v.1c-.2.8-.4 1.6-.4 2.4 0 4.1 3.1 7.5 7 8.1h.2c.3 0 .7.1 1 .1.4 0 .7 0 1-.1h.2c4-.6 7.1-4.1 7.1-8.1 0-.8-.1-1.7-.4-2.4V34l-5.1-15.4c.4-.2.7-.6 1-.9zM66 92.8c16.9 0 32.8 1.1 47.1 3.2 4-16.9 8.9-26.7 14-33.5l-9.6-3.4c1 4.9 1.1 7.2 0 10.2-1.5-1.4-3-4.3-4.2-8.7L108.6 76c2.8-2 5-3.2 7.5-3.3-4.4 9.4-10 11.9-13.6 11.2-4.3-.8-6.3-4.6-5.6-7.9 1-4.7 5.7-5.9 8-.5 4.3-8.7-3-11.4-7.6-8.8 7.1-7.2 7.9-13.5 2.1-21.1-8 6.1-8.1 12.3-4.5 20.8-4.7-5.4-12.1-2.5-9.5 6.2 3.4-5.2 7.9-2 7.2 3.1-.6 4.3-6.4 7.8-13.5 7.2-10.3-.9-10.9-8-11.2-13.8 2.5-.5 7.1 1.8 11 7.3L80.2 60c-4.1 4.4-8 5.3-12.3 5.4 1.4-4.4 8-11.6 8-11.6H55.5s6.4 7.2 7.9 11.6c-4.2-.1-8-1-12.3-5.4l1.4 16.4c3.9-5.5 8.5-7.7 10.9-7.3-.3 5.8-.9 12.8-11.1 13.8-7.2.6-12.9-2.9-13.5-7.2-.7-5 3.8-8.3 7.1-3.1 2.7-8.7-4.6-11.6-9.4-6.2 3.7-8.5 3.6-14.7-4.6-20.8-5.8 7.6-5 13.9 2.2 21.1-4.7-2.6-11.9.1-7.7 8.8 2.3-5.5 7.1-4.2 8.1.5.7 3.3-1.3 7.1-5.7 7.9-3.5.7-9-1.8-13.5-11.2 2.5.1 4.7 1.3 7.5 3.3l-4.7-15.4c-1.2 4.4-2.7 7.2-4.3 8.7-1.1-3-.9-5.3 0-10.2l-9.5 3.4c5 6.9 9.9 16.7 14 33.5 14.8-2.1 30.8-3.2 47.7-3.2z"></path>
         <image src="<%= asset_path('govuk-logotype-crown.png') %>" class="gem-c-modal-dialogue__logotype-crown-fallback-image"></image>
       </svg>
-    </div>
-    <div class="gem-c-modal-dialogue__content">
-      <%= yield %>
-    </div>
-    <button class="gem-c-modal-dialogue__close-button" aria-label="Close modal dialogue">&times;</button>
+    <% end %>
+    <%= tag.div yield, class: "gem-c-modal-dialogue__content" %>
+    <%= tag.button "×", class: "gem-c-modal-dialogue__close-button", aria: { label: "Close modal dialogue" } %>
   <% end %>
-</div>
+<% end %>

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '17.1.0'.freeze
+  VERSION = '17.1.1'.freeze
 end

data/node_modules/accessible-autocomplete/package.json

@@ -49,7 +49,7 @@
     "/"
   ],
   "_resolved": "git://github.com/alphagov/accessible-autocomplete.git#3523dd9fffc70cbd9f6f555f75863c33a709f49e",
-  "_shasum": "bf4c71ceba91fbe87d23ae3cd32a3085e265b83f",
+  "_shasum": "43f3031501fd6d8434749b5ad34c3f8ee23d991f",
   "_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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 17.1.0
+  version: 17.1.1
 platform: ruby
 authors:
 - GOV.UK Dev