]> git.ipfire.org Git - thirdparty/foundation/foundation-sites.git/commitdiff
Merge branch 'develop' into accordion-submenu-toggle
authorKevin Ball <kmball11@gmail.com>
Wed, 24 May 2017 23:42:18 +0000 (16:42 -0700)
committerKevin Ball <kmball11@gmail.com>
Wed, 24 May 2017 23:42:18 +0000 (16:42 -0700)
1  2 
docs/pages/accordion-menu.md
js/foundation.accordionMenu.js

Simple merge
index d33059f88975ecadebea2d147b4dab9bb0d31948,b79fd8851bf055dfc1e4ba94acf5b7a1d69f6e9b..852daffd0d72520e444f59fb6839ddbe99f8a4ba
@@@ -48,11 -48,9 +48,11 @@@ class AccordionMenu extends Plugin 
     * @private
     */
    _init() {
 +    var _this = this;
 +
      this.$element.find('[data-submenu]').not('.is-active').slideUp(0);//.find('a').css('padding-left', '1rem');
      this.$element.attr({
-       'role': 'menu',
+       'role': 'tree',
        'aria-multiselectable': this.options.multiOpen
      });
  
            $sub = $elem.children('[data-submenu]'),
            subId = $sub[0].id || GetYoDigits(6, 'acc-menu'),
            isActive = $sub.hasClass('is-active');
 -      $elem.attr({
 -        'aria-controls': subId,
 -        'aria-expanded': isActive,
 -        'id': linkId
 -      });
 +
 +
 +      if(_this.options.submenuToggle) {
 +        $elem.addClass('has-submenu-toggle');
 +        $elem.children('a').after('<button id="' + linkId + '" class="submenu-toggle" aria-controls="' + subId + '" aria-expanded="' + isActive + '" title="' + _this.options.submenuToggleText + '"><span class="submenu-toggle-text">' + _this.options.submenuToggleText + '</span></button>');
 +      } else {
 +        $elem.attr({
 +          'aria-controls': subId,
 +          'aria-expanded': isActive,
-           'role': 'menuitem',
 +          'id': linkId
 +        });
 +      }
        $sub.attr({
          'aria-labelledby': linkId,
          'aria-hidden': !isActive,