From: Colin Marshall <colin.michael.marshall@gmail.com>
Date: Sat, 16 Jun 2018 07:10:42 +0000 (+0200)
Subject: Use pull request #10871 from colin-marshall/fix/accordion-duplicate-id-10870 for... 
X-Git-Tag: v6.5.0-rc.1^2~159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22fa9865e9d01461df13a01cf798d3a7844917be;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

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

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 ecd2b4eb8..7ec830bfe 100644
--- 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,