Merge branch 'master' into v4

1 files changed, 45 insertions, 35 deletions

diff --git a/js/tests/visual/dropdown.html b/js/tests/visual/dropdown.html
index a51267de8..f9df5d07e 100644
--- a/js/tests/visual/dropdown.html
+++ b/js/tests/visual/dropdown.html
@@ -30,35 +30,41 @@
       <div class="collapse navbar-toggleable-xs" id="exCollapsingNavbar2">
         <ul class="nav navbar-nav pull-left">
           <li class="dropdown nav-item">
-            <a id="drop1" href="#" role="button" class="dropdown-toggle nav-link" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
-            <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
-              <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Action</a></li>
-              <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Another action</a></li>
-              <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Something else here</a></li>
-              <li role="presentation" class="divider"></li>
-              <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Separated link</a></li>
+            <a id="drop1" href="#" role="button" class="dropdown-toggle nav-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Dropdown
+            </a>
+            <ul class="dropdown-menu" aria-labelledby="drop1">
+              <li><a href="https://twitter.com/fat">Action</a></li>
+              <li><a href="https://twitter.com/fat">Another action</a></li>
+              <li><a href="https://twitter.com/fat">Something else here</a></li>
+              <li role="separator" class="divider"></li>
+              <li><a href="https://twitter.com/fat">Separated link</a></li>
             </ul>
           </li>
           <li class="dropdown nav-item">
-            <a href="#" id="drop2" role="button" class="dropdown-toggle nav-link" data-toggle="dropdown">Dropdown 2 <b class="caret"></b></a>
-            <ul class="dropdown-menu" role="menu" aria-labelledby="drop2">
-              <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Action</a></li>
-              <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Another action</a></li>
-              <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Something else here</a></li>
-              <li role="presentation" class="divider"></li>
-              <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Separated link</a></li>
+            <a href="#" id="drop2" role="button" class="dropdown-toggle nav-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Dropdown 2
+            </a>
+            <ul class="dropdown-menu" aria-labelledby="drop2">
+              <li><a href="https://twitter.com/fat">Action</a></li>
+              <li><a href="https://twitter.com/fat">Another action</a></li>
+              <li><a href="https://twitter.com/fat">Something else here</a></li>
+              <li role="separator" class="divider"></li>
+              <li><a href="https://twitter.com/fat">Separated link</a></li>
             </ul>
           </li>
         </ul>
         <ul class="nav navbar-nav pull-right">
           <li id="fat-menu" class="dropdown nav-item">
-            <a href="#" id="drop3" role="button" class="dropdown-toggle nav-link" data-toggle="dropdown">Dropdown 3 <b class="caret"></b></a>
-            <ul class="dropdown-menu" role="menu" aria-labelledby="drop3">
-              <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Action</a></li>
-              <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Another action</a></li>
-              <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Something else here</a></li>
-              <li role="presentation" class="divider"></li>
-              <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Separated link</a></li>
+            <a href="#" id="drop3" role="button" class="dropdown-toggle nav-link" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              Dropdown 3
+            </a>
+            <ul class="dropdown-menu" aria-labelledby="drop3">
+              <li><a href="https://twitter.com/fat">Action</a></li>
+              <li><a href="https://twitter.com/fat">Another action</a></li>
+              <li><a href="https://twitter.com/fat">Something else here</a></li>
+              <li role="separator" class="divider"></li>
+              <li><a href="https://twitter.com/fat">Separated link</a></li>
             </ul>
           </li>
         </ul>
@@ -69,23 +75,27 @@
   <ul class="nav nav-pills">
     <li class="active nav-item"><a href="#" class="nav-link">Regular link</a></li>
     <li class="dropdown nav-item">
-      <a id="drop4" class="nav-link" role="button" data-toggle="dropdown" href="#">Dropdown <b class="caret"></b></a>
-      <ul id="menu1" class="dropdown-menu" role="menu" aria-labelledby="drop4">
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Action</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Another action</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Something else here</a></li>
-        <li role="presentation" class="divider"></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Separated link</a></li>
+      <a id="drop4" class="nav-link" role="button" data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false">
+        Dropdown
+      </a>
+      <ul id="menu1" class="dropdown-menu" aria-labelledby="drop4">
+        <li><a href="https://twitter.com/fat">Action</a></li>
+        <li><a href="https://twitter.com/fat">Another action</a></li>
+        <li><a href="https://twitter.com/fat">Something else here</a></li>
+        <li role="separator" class="divider"></li>
+        <li><a href="https://twitter.com/fat">Separated link</a></li>
       </ul>
     </li>
     <li class="dropdown nav-item">
-      <a id="drop5" class="nav-link" role="button" data-toggle="dropdown" href="#">Dropdown 2 <b class="caret"></b></a>
-      <ul id="menu2" class="dropdown-menu" role="menu" aria-labelledby="drop5">
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Action</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Another action</a></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Something else here</a></li>
-        <li role="presentation" class="divider"></li>
-        <li role="presentation"><a role="menuitem" tabindex="-1" href="https://twitter.com/fat">Separated link</a></li>
+      <a id="drop5" class="nav-link" role="button" data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false">
+        Dropdown 2
+      </a>
+      <ul id="menu2" class="dropdown-menu" aria-labelledby="drop5">
+        <li><a href="https://twitter.com/fat">Action</a></li>
+        <li><a href="https://twitter.com/fat">Another action</a></li>
+        <li><a href="https://twitter.com/fat">Something else here</a></li>
+        <li role="separator" class="divider"></li>
+        <li><a href="https://twitter.com/fat">Separated link</a></li>
       </ul>
     </li>
   </ul>