Menubar Examples: remove aria-label from parent menuitems (pull #398)

This commit resolves issue #395 for the menubar examples: 1. Removes aria-label from the parent menuitems 2. Updates roles, states, and properties documentation table
w3c · Jun 18, 2017 · 597799f · 597799f
1 parent e19d3c4
commit 597799f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 24 deletions.
diff --git a/examples/menubar/menubar-1/menubar-1.html b/examples/menubar/menubar-1/menubar-1.html
@@ -47,7 +47,7 @@ <h3 id="ex1_label">Example 1: Menubar With ARIA Markup in the HTML Source</h3>
         <ul id="menubar1" role="menubar" aria-label="Mythical University Menu 1">
           <li>
             <a role="menuitem" aria-haspopup="true" aria-expanded="false" href="#">About</a>
-            <ul role="menu" aria-label="About">
+            <ul role="menu">
               <li role="none">
                 <a role="menuitem" href="mb-about.html#overview">Overview</a>
               </li>
@@ -58,7 +58,7 @@ <h3 id="ex1_label">Example 1: Menubar With ARIA Markup in the HTML Source</h3>
                 <a id="menubar113" role="menuitem" href="#" aria-haspopup="true"
                   aria-expanded="false"
                 >Facts</a>
-                <ul role="menu" aria-label="facts">
+                <ul role="menu">
                   <li role="none">
                     <a role="menuitem" href="mb-about.html#facts">History</a>
                   </li>
@@ -72,7 +72,7 @@ <h3 id="ex1_label">Example 1: Menubar With ARIA Markup in the HTML Source</h3>
               <li>
                 <a role="menuitem" href="#" aria-haspopup="true" aria-expanded="false">Campus
                   Tours</a>
-                <ul role="menu" aria-label="Campus Tours">
+                <ul role="menu">
                   <li role="none">
                     <a role="menuitem" href="mb-about.html#tours">For prospective students</a>
                   </li>
@@ -87,7 +87,7 @@ <h3 id="ex1_label">Example 1: Menubar With ARIA Markup in the HTML Source</h3>
           </li>
           <li>
             <a role="menuitem" aria-haspopup="true" aria-expanded="false" href="#">Admissions</a>
-            <ul role="menu" aria-label="admissions">
+            <ul role="menu">
               <li role="none">
                 <a role="menuitem" href="mb-admissions.html#apply">Apply</a>
               </li>
@@ -111,7 +111,7 @@ <h3 id="ex1_label">Example 1: Menubar With ARIA Markup in the HTML Source</h3>
           </li>
           <li>
             <a role="menuitem" aria-haspopup="true" aria-expanded="false" href="#">Academics</a>
-            <ul role="menu" aria-label="Academics">
+            <ul role="menu">
               <li role="none">
                 <a role="menuitem" href="mb-academics.html#colleges">Colleges &amp; Schools</a>
               </li>

diff --git a/examples/menubar/menubar-2/menubar-2.html b/examples/menubar/menubar-2/menubar-2.html
@@ -47,7 +47,7 @@ <h2 id="ex1_label">Example</h2>
     <div role="separator" id="ex1_start_sep" aria-labelledby="ex1_start_sep ex1_label" aria-label="Start of"></div>
     <div id="ex1">
       <ul id="menubar1" role="menubar" aria-label="Text Formatting">
-        <li role="menuitem" aria-haspopup="true" aria-expanded="false" aria-label="Font">
+        <li role="menuitem" aria-haspopup="true" aria-expanded="false">
           <span>Font</span>
           <ul role="menu" rel="font-family" aria-label="Font" >
             <li role="menuitemradio" aria-checked="true">Sans-serif</li>
@@ -56,7 +56,7 @@ <h2 id="ex1_label">Example</h2>
             <li role="menuitemradio" aria-checked="false">Fantasy</li>
           </ul>
         </li>
-        <li role="menuitem" aria-haspopup="true" aria-expanded="false" aria-label="Style/Color">
+        <li role="menuitem" aria-haspopup="true" aria-expanded="false">
           <span>Style/Color</span>
           <ul role="menu" aria-label="Style/Color">
             <li role="menuitemcheckbox" rel="font-bold" aria-checked="false">Bold</li>
@@ -80,7 +80,7 @@ <h2 id="ex1_label">Example</h2>
           </ul>
         </li>
 
-        <li role="menuitem" aria-haspopup="true" aria-expanded="false" aria-label="Text Align">
+        <li role="menuitem" aria-haspopup="true" aria-expanded="false">
           <span>Text Align</span>
           <ul role="menu" rel="text-align" aria-label="Text Align">
             <li role="menuitemradio" aria-checked="true">Left</li>
@@ -90,7 +90,7 @@ <h2 id="ex1_label">Example</h2>
           </ul>
         </li>
 
-        <li role="menuitem" aria-haspopup="true" aria-expanded="false" aria-label="Size">
+        <li role="menuitem" aria-haspopup="true" aria-expanded="false">
           <span>Size</span>
           <ul role="menu" aria-label="Size" >
             <li role="menuitem" rel="font-smaller">Smaller</li>
@@ -381,21 +381,6 @@ <h3 id="rps1_label">Menubar</h3>
               Identifies the <code>li</code> element as a menu item within the menubar widget.
             </td>
           </tr>
-          <tr>
-            <td></td>
-            <th scope="row">
-              <code>aria-label=&quot;<em>string</em>&quot;</code>
-            </th>
-            <td>
-              <code>li</code>
-            </td>
-            <td>
-              <ul>
-                <li>Defines an acessible name for the <code>menuitem</code>.</li>
-                <li>Overrides browser calculation of accessible name from inner text of all descendants, which includes all the popup menu item names.</li>
-              </ul>
-            </td>
-          </tr>
           <tr>
             <td></td>
             <th scope="row">