From: Kevin Ball Date: Mon, 19 Jun 2017 21:47:24 +0000 (-0700) Subject: Merge branch 'develop' into hotfix/drilldown-menu-not-working X-Git-Tag: v6.4.0-rc4~2^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F10205%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git Merge branch 'develop' into hotfix/drilldown-menu-not-working --- 1621c7ba5d0dbca7227e0925ce282cb29a766085 diff --cc js/foundation.drilldown.js index ef99dc65e,a770584ae..2029906bd --- a/js/foundation.drilldown.js +++ b/js/foundation.drilldown.js @@@ -48,12 -48,13 +48,17 @@@ class Drilldown extends Plugin * @private */ _init() { + if(this.options.autoApplyClass) { + this.$element.addClass('drilldown'); + } ++ + this.$element.attr({ + 'role': 'tree', + 'aria-multiselectable': false + }); this.$submenuAnchors = this.$element.find('li.is-drilldown-submenu-parent').children('a'); - this.$submenus = this.$submenuAnchors.parent('li').children('[data-submenu]'); - this.$menuItems = this.$element.find('li').not('.js-drilldown-back').attr('role', 'menuitem').find('a'); + this.$submenus = this.$submenuAnchors.parent('li').children('[data-submenu]').attr('role', 'group'); + this.$menuItems = this.$element.find('li').not('.js-drilldown-back').attr('role', 'treeitem').find('a'); this.$element.attr('data-mutate', (this.$element.attr('data-drilldown') || GetYoDigits(6, 'drilldown'))); this._prepareMenu();