Use pull request #10871 from colin-marshall/fix/accordion-duplicate-id-10870 for...

dd020a705 Fixed duplicate id's on accordion when id is already set on <li> elements

Signed-off-by: Nicolas Coden <nicolas@ncoden.fr>

diff --git a/js/foundation.accordion.js b/js/foundation.accordion.js
index ecd2b4eb8bc1b10e4c7c33ee9eb126bcf126fcbb..7ec830bfe124511af3e1932005e43ffe376effc6 100644 (file)
--- a/js/foundation.accordion.js
+++ b/js/foundation.accordion.js
@@ -47,7 +47,7 @@ class Accordion extends Plugin {
       var $el = $(el),
           $content = $el.children('[data-tab-content]'),
           id = $content[0].id || GetYoDigits(6, 'accordion'),
-          linkId = el.id || `${id}-label`;
+          linkId = (el.id) ? `${el.id}-label` : `${id}-label`;
 
       $el.find('a:first').attr({
         'aria-controls': id,