From: Dinis Correia <diniscorreia@mac.com>
Date: Wed, 16 Nov 2016 13:58:10 +0000 (+0000)
Subject: Fix dropdown destroy method
X-Git-Tag: v6.6.0~3^2~309^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3f24fe7d;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Fix dropdown destroy method

This fixes issue #9339. When destroying a dropdown menu, the dropdown
classes wouldn’t be removed if using a different class structure (for
instance, using custom class names instead of `.menu`). Previous
versions selected all child elements of the menu but on the latest
version only direct `li` childs or  elements with `.menu` class

This commit ensures `ul` elements also get the classes removed, for
those cases where custom classes are used.
---

diff --git a/js/foundation.util.nest.js b/js/foundation.util.nest.js
index 82603a790..67031555d 100644
--- a/js/foundation.util.nest.js
+++ b/js/foundation.util.nest.js
@@ -63,7 +63,7 @@ const Nest = {
         hasSubClass = `is-${type}-submenu-parent`;
 
     menu
-      .find('>li, .menu, .menu > li')
+      .find('>li, > li > ul, .menu, .menu > li')
       .removeClass(`${subMenuClass} ${subItemClass} ${hasSubClass} is-submenu-item submenu is-active`)
       .removeAttr('data-submenu').css('display', '');