Merge pull request #403 from paulwaitehomeoffice/show-hide-content-ch…

…aracters-in-name-attribute

Add support to show-hide-content.js for form fields with more varied …

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Unreleased
+
+- Fix: Add support to show-hide-content.js for form fields with more varied characters: ([PR 403](https://github.com/alphagov/govuk_frontend_toolkit/pull/403))
+
 # 7.6.0
 
 - Strip emails from urls for all GA requests to catch cases when GA generates a new event (e.g. page timings): ([PR 466](https://github.com/alphagov/govuk_frontend_toolkit/pull/466)).

javascripts/govuk/show-hide-content.js

@@ -14,12 +14,6 @@
       checkbox: '[data-target] > input[type="checkbox"]'
     }
 
-    // Escape name attribute for use in DOM selector
-    function escapeElementName (str) {
-      var result = str.replace('[', '\\[').replace(']', '\\]')
-      return result
-    }
-
     // Adds ARIA attributes to control + associated content
     function initToggledContent () {
       var $control = $(this)
@@ -79,7 +73,7 @@
     // Handle radio show/hide
     function handleRadioContent ($control, $content) {
       // All radios in this group which control content
-      var selector = selectors.radio + '[name=' + escapeElementName($control.attr('name')) + '][aria-controls]'
+      var selector = selectors.radio + '[name="' + $control.attr('name') + '"][aria-controls]'
       var $form = $control.closest('form')
       var $radios = $form.length ? $form.find(selector) : $(selector)