From: Chris Oyler <chris@zurb.com>
Date: Mon, 18 Jan 2016 19:53:53 +0000 (-0800)
Subject: updates nest util, removes unused classes and aria attibutes
X-Git-Tag: v6.1.2~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1c61a8272aa5070a49ad16a502264cf62aaa512c;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

updates nest util, removes unused classes and aria attibutes
---

diff --git a/js/foundation.accordionMenu.js b/js/foundation.accordionMenu.js
index 752e86b14..a249a68ea 100644
--- a/js/foundation.accordionMenu.js
+++ b/js/foundation.accordionMenu.js
@@ -73,7 +73,6 @@
       $elem.attr({
         'aria-controls': subId,
         'aria-expanded': isActive,
-        'aria-selected': false,
         'role': 'tab',
         'id': linkId
       });
@@ -209,7 +208,7 @@
     }
 
     $target.addClass('is-active').attr({'aria-hidden': false})
-      .parent('.is-accordion-submenu-parent').attr({'aria-expanded': true, 'aria-selected': true});
+      .parent('.is-accordion-submenu-parent').attr({'aria-expanded': true});
 
       Foundation.Move(this.options.slideSpeed, $target, function(){
         $target.slideDown(_this.options.slideSpeed, function () {
@@ -241,10 +240,10 @@
     $target.attr('aria-hidden', true)
            .find('[data-submenu]').slideUp(0).attr('aria-hidden', true).end()
            .parent('.is-accordion-submenu-parent')
-           .attr({'aria-expanded': false, 'aria-selected': false});
+           .attr({'aria-expanded': false});
     // $target.slideUp(this.options.slideSpeed, function() {
     //   $target.find('[data-submenu]').slideUp(0).attr('aria-hidden', true);
-    // }).attr('aria-hidden', true).parent('.has-submenu').attr({'aria-expanded': false, 'aria-selected': false});
+    // }).attr('aria-hidden', true).parent('.has-submenu').attr({'aria-expanded': false});
   };
 
   /**
diff --git a/js/foundation.util.nest.js b/js/foundation.util.nest.js
index 5bd855be8..d6b53c526 100644
--- a/js/foundation.util.nest.js
+++ b/js/foundation.util.nest.js
@@ -13,10 +13,9 @@
         var $item = $(this),
             $sub = $item.children('ul');
         if($sub.length){
-          $item.addClass('has-submenu ' + hasSubClass)
+          $item.addClass(hasSubClass)
                .attr({
                  'aria-haspopup': true,
-                 'aria-selected': false,
                  'aria-expanded': false,
                  'aria-label': $item.children('a:first').text()
                });
@@ -42,7 +41,7 @@
       // menu.find('.is-active').removeClass('is-active');
       menu.find('*')
       // menu.find('.' + subMenuClass + ', .' + subItemClass + ', .is-active, .has-submenu, .is-submenu-item, .submenu, [data-submenu]')
-          .removeClass(subMenuClass + ' ' + subItemClass + ' ' + hasSubClass + ' has-submenu is-submenu-item submenu is-active')
+          .removeClass(subMenuClass + ' ' + subItemClass + ' ' + hasSubClass + ' is-submenu-item submenu is-active')
           .removeAttr('data-submenu').css('display', '');
 
       // console.log(      menu.find('.' + subMenuClass + ', .' + subItemClass + ', .has-submenu, .is-submenu-item, .submenu, [data-submenu]')