Merge branch 'master' of github.com:campuspress/divi-accessibility

* 'master' of github.com:campuspress/divi-accessibility:
  New/fix duplicate menu ids (#15)

Author: josephfusco

admin/class-divi-accessibility-admin.php

@@ -169,6 +169,7 @@ public static function get_options_list() {
 			'screen_reader_text'           => 1,
 			'skip_navigation_link'         => 1,
 			'aria_hidden_icons'            => 1,
+			'fix_duplicate_menu_ids'       => 1,
 			'tota11y'                      => 0,
 			'developer_mode'               => 0,
 		);
@@ -332,7 +333,22 @@ public function register_settings() {
 				'name'          => 'aria_hidden_icons',
 				'label_for'     => $this->da11y . '_aria_hidden_icons',
 				'label_text'    => 'Hide all icons to screen readers so text is read normally.',
-				'label_subtext' => 'Note: This may not work for all icons',
+				'label_subtext' => 'This may not work for all icons',
+			)
+		);
+
+		// Fix duplicate menu ids.
+		add_settings_field(
+			$this->da11y . '_fix_duplicate_menu_ids',
+			'Fix duplicate menu ids',
+			array( $this, 'divi_accessibility_checkbox_cb' ),
+			$this->da11y,
+			$general_section,
+			array(
+				'name'          => 'fix_duplicate_menu_ids',
+				'label_for'     => $this->da11y . '_fix_duplicate_menu_ids',
+				'label_text'    => 'Because Divi uses the same menu twice (Once for the primary menu and again for the mobile menu), the unique ID\'s are duplicated causing validation issues. This option prevents WordPress from adding a unique ID to the menu list items.',
+				'label_subtext' => '',
 			)
 		);
 

divi-accessibility.php

@@ -9,14 +9,14 @@
  * that starts the plugin.
  *
  * @link              https://campuspress.com
- * @since             1.0.0
+ * @since             1.2.0
  * @package           Divi_Accessibility
  *
  * @wordpress-plugin
  * 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.1.0
+ * Version:           1.2.0
  * Author:            CampusPress
  * Author URI:        https://campuspress.com
  * License:           GPL-2.0+
@@ -35,7 +35,7 @@
 	define( 'DA11Y_FILE', plugin_basename( __FILE__ ) );
 }
 
-// Used for referring to the plugin base path
+// Used for referring to the plugin base path.
 if ( ! defined( 'DA11Y_PATH' ) ) {
 	define( 'DA11Y_PATH', plugin_dir_path( __FILE__ ) );
 }

includes/class-divi-accessibility.php

@@ -86,13 +86,13 @@ class Divi_Accessibility {
 	 * Load the dependencies, define the locale, and set the hooks for the admin area and
 	 * the public-facing side of the site.
 	 *
-	 * @since    1.1.0
+	 * @since    1.2.0
 	 */
 	public function __construct() {
 
 		$this->da11y         = 'divi_accessibility';
 		$this->da11y_options = 'divi_accessibility_options';
-		$this->version       = '1.1.0';
+		$this->version       = '1.2.0';
 
 		$this->load_dependencies();
 		$this->load_settings();
@@ -175,6 +175,7 @@ private function define_public_hooks() {
 		$this->loader->add_action( 'wp_footer', $plugin_public, 'developer_mode' );
 		$this->loader->add_action( 'init', $plugin_public, 'remove_divi_viewport_meta' );
 		$this->loader->add_action( 'wp_head', $plugin_public, 'accessible_viewport_meta' );
+		$this->loader->add_filter( 'init', $plugin_public, 'remove_duplicate_menu_ids' );
 
 	}
 

public/class-divi-accessibility-public.php

@@ -165,6 +165,21 @@ public function can_load( $option ) {
 
 	}
 
+	/**
+	 * Prevent WordPress from adding a unique ID from menu list items.
+	 * Because Divi uses js to build the mobile navigation menu from the main navigation links,
+	 * unique ID's are cloned, causing issues with accessibility & validation.
+	 *
+	 * @since     1.2.0
+	 */
+	public function remove_duplicate_menu_ids() {
+
+		if ( $this->can_load( 'fix_duplicate_menu_ids' ) ) {
+			add_filter( 'nav_menu_item_id', '__return_null', 1000 );
+		}
+
+	}
+
 	/**
 	 * Log plugin info to console for admin users.
 	 *

readme.txt

@@ -52,6 +52,9 @@ Plugin created by [CampusPress](https://campuspress.com). Plugin icon based off
 
 == Changelog ==
 
+= 1.2 =
+* Add option to remove id attribute from list items in navigation menus
+
 = 1.1 =
 * Add option to hide decorative icons from screen readers
 * Add hidden submit button to search