Merge pull request #18 from campuspress/update/submenus

Navigation Enhancements

Author: alexstine

divi-accessibility.php

@@ -16,7 +16,7 @@
  * Plugin Name:       Divi Accessibility
  * Plugin URI:        https://wordpress.org/plugins/accessible-divi/
  * Description:       Improve Divi accessibility in accordance with WCAG 2.0 guidelines.
- * Version:           1.2.1
+ * Version:           1.2.2
  * Author:            CampusPress
  * Author URI:        https://campuspress.com
  * License:           GPL-2.0+

public/class-divi-accessibility-public.php

@@ -155,13 +155,15 @@ public function can_load_tota11y() {
 	 */
 	public function can_load( $option ) {
 
-		$settings = $this->settings;
+		$can_load = false;
 
+		$settings = $this->settings;
+		
 		if ( isset( $settings[ $option ] ) && 1 == $settings[ $option ] ) {
-			return true;
+			$can_load = true;
 		}
 
-		return false;
+		return apply_filters( 'divi_accessibility_can_load', $can_load, $option );
 
 	}
 

public/partials/divi-accessibility-embedded-css.php

@@ -31,6 +31,9 @@
 	visibility: visible !important;
 	opacity: 1 !important; <?php // Necessary for tabbing through the primary top nav - Divi only has .et-hover containing visibility. ?>
 }
+.da11y-submenu-show {
+	visibility: visible !important;
+}
 <?php
 
 } // End if().

public/partials/divi-accessibility-embedded-js.php

@@ -25,27 +25,15 @@
 	(function ($) {
 		$(document).ready(function () {
 
-			var hoverClasses = 'et-hover et-show-dropdown';
-			var currentListItem = '';
-
-			/**
-			 * Update top navigation classes.
-			 */
-			function update_navigation_classes(el) {
-				var currentLink = el.find('a:focus');
-				currentListItem = currentLink.closest('li');
-
-				// check if focused on top level nav item
-				if (el.is(currentListItem.closest('ul')) || el.find('a:focus').length === 0) {
-					el.find('li').removeClass(hoverClasses);
-				}
-
-				// add appropriate divi hover classes if nav item has children
-				if ($(currentListItem).children('ul').length) {
-					currentListItem.addClass(hoverClasses);
-				}
+			if($('.menu-item-has-children').find('a') ) {
+				$('.menu-item-has-children').find('a').not('.sub-menu a').attr('aria-expanded', 'false').addClass('da11y-submenu');
 			}
 
+			$('.da11y-submenu').focus(function() {
+				$(this).attr('aria-expanded', 'true');
+				$('.sub-menu').addClass('da11y-submenu-show');
+			});
+
 			/**
 			 * Generate search form styles.
 			 *
@@ -117,12 +105,6 @@ function hide_search() {
 
 			$(this).keyup(function () {
 
-				var nav = $('.nav');
-				var menu = $('.menu');
-
-				update_navigation_classes(nav);
-				update_navigation_classes(menu);
-
 				$('.et-search-field').focus(function () {
 					show_search();
 				}).blur(function () {
@@ -505,34 +487,6 @@ function skipTo(target) {
 			 */
 			$('.et-pb-contact-message').attr('role', 'alert');
 
-			/**
-			 * Add role="menubar" to top level unorderd lists.
-			 */
-			$('.nav').each(function () {
-				$(this).attr('role', 'menubar');
-			});
-
-			/**
-			 * Add role="menubar" to top level unorderd lists.
-			 */
-			$('.bottom-nav').each(function () {
-				$(this).attr('role', 'menubar');
-			});
-
-			/**
-			 * Add role="menubar" to top level unorderd lists.
-			 */
-			$('.menu').each(function () {
-				$(this).attr('role', 'menubar');
-			});
-
-			/**
-			 * Add role="menubar" to top level unorderd lists.
-			 */
-			$('.sub-menu').each(function () {
-				$(this).attr('role', 'menu');
-			});
-
 			/**
 			 * Add aria-label="x".
 			 *

readme.txt

@@ -52,6 +52,10 @@ Plugin created by [CampusPress](https://campuspress.com). Plugin icon based off
 
 == Changelog ==
 
+= 1.2.2 =
+* Landmark refactoring for navigation.
+* Add better support for submenus.
+
 = 1.2.1 =
 * Add better aria attribute support to navigation menus, comment forms, etc.
 * CSS fixes.