From 0241a7e29bdeb0380fee47d63ce793f2b8fd5c7e Mon Sep 17 00:00:00 2001 From: Dave Gross Date: Mon, 9 Mar 2015 09:48:31 -0400 Subject: [PATCH] Fix issue #6371 - change .accordion-navigation references to DD and DL so that the mixin will work with custom class names --- js/foundation/foundation.accordion.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/js/foundation/foundation.accordion.js b/js/foundation/foundation.accordion.js index a2ae623f6..b036bfb46 100644 --- a/js/foundation/foundation.accordion.js +++ b/js/foundation/foundation.accordion.js @@ -23,24 +23,24 @@ var S = this.S; S(this.scope) .off('.fndtn.accordion') - .on('click.fndtn.accordion', '[' + this.attr_name() + '] > .accordion-navigation > a', function (e) { + .on('click.fndtn.accordion', '[' + this.attr_name() + '] > dd > a, [' + this.attr_name() + '] > li > a', function (e) { var accordion = S(this).closest('[' + self.attr_name() + ']'), groupSelector = self.attr_name() + '=' + accordion.attr(self.attr_name()), settings = accordion.data(self.attr_name(true) + '-init') || self.settings, target = S('#' + this.href.split('#')[1]), - aunts = $('> .accordion-navigation', accordion), + aunts = $('> dd, > li', accordion), siblings = aunts.children('.' + settings.content_class), active_content = siblings.filter('.' + settings.active_class); e.preventDefault(); if (accordion.attr(self.attr_name())) { - siblings = siblings.add('[' + groupSelector + '] dd > ' + '.' + settings.content_class); - aunts = aunts.add('[' + groupSelector + '] .accordion-navigation'); + siblings = siblings.add('[' + groupSelector + '] dd > ' + '.' + settings.content_class + ', [' + groupSelector + '] li > ' + '.' + settings.content_class); + aunts = aunts.add('[' + groupSelector + '] dd, [' + groupSelector + '] li'); } if (settings.toggleable && target.is(active_content)) { - target.parent('.accordion-navigation').toggleClass(settings.active_class, false); + target.parent('dd, li').toggleClass(settings.active_class, false); target.toggleClass(settings.active_class, false); settings.callback(target); target.triggerHandler('toggled', [accordion]); -- 2.47.2