diff --git a/docs/javascript.html b/docs/javascript.html
index 6c4fbf7fbb1ecf1a3cf9b2f220a2cb8746b07372..d519faede2c5d8fa41843588599f6910cd4b1b9d 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -402,21 +402,21 @@ $('#myModal').on('hidden', function () {
<li class="dropdown">
<a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
- <li><a tabindex="-1" href="http://google.com">Action</a></li>
- <li><a tabindex="-1" href="#anotherAction">Another action</a></li>
- <li><a tabindex="-1" href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a tabindex="-1" href="#">Separated link</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="http://google.com">Action</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="#anotherAction">Another action</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="#">Something else here</a></li>
+ <li role="presentation" class="divider"></li>
+ <li role="presentation"><a tabindex="-1" role="separator" href="#">Separated link</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" id="drop2" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown 2 <b class="caret"></b></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="drop2">
- <li><a tabindex="-1" href="#">Action</a></li>
- <li><a tabindex="-1" href="#">Another action</a></li>
- <li><a tabindex="-1" href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a tabindex="-1" href="#">Separated link</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="#">Action</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="#">Another action</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="#">Something else here</a></li>
+ <li class="divider" role="presentation"></li>
+ <li role="presentation"><a tabindex="-1" role="separator" href="#">Separated link</a></li>
</ul>
</li>
</ul>
@@ -424,11 +424,11 @@ $('#myModal').on('hidden', function () {
<li id="fat-menu" class="dropdown">
<a href="#" id="drop3" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown 3 <b class="caret"></b></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="drop3">
- <li><a tabindex="-1" href="#">Action</a></li>
- <li><a tabindex="-1" href="#">Another action</a></li>
- <li><a tabindex="-1" href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a tabindex="-1" href="#">Separated link</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="#">Action</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="#">Another action</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="#">Something else here</a></li>
+ <li role="presentation" class="divider"></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="separator">Separated link</a></li>
</ul>
</li>
</ul>
@@ -444,31 +444,31 @@ $('#myModal').on('hidden', function () {
<li class="dropdown">
<a class="dropdown-toggle" id="drop4" role="button" data-toggle="dropdown" href="#">Dropdown <b class="caret"></b></a>
<ul id="menu1" class="dropdown-menu" role="menu" aria-labelledby="drop4">
- <li><a tabindex="-1" href="#">Action</a></li>
- <li><a tabindex="-1" href="#">Another action</a></li>
- <li><a tabindex="-1" href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a tabindex="-1" href="#">Separated link</a></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="menuitem">Action</a></li>
+ <li><a tabindex="-1" href="#" role="menuitem">Another action</a></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="menuitem">Something else here</a></li>
+ <li class="divider" role="presentation"></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="separator">Separated link</a></li>
</ul>
</li>
<li class="dropdown">
<a class="dropdown-toggle" id="drop5" 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><a tabindex="-1" href="#">Action</a></li>
- <li><a tabindex="-1" href="#">Another action</a></li>
- <li><a tabindex="-1" href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a tabindex="-1" href="#">Separated link</a></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="menuitem">Action</a></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="menuitem">Another action</a></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="menuitem">Something else here</a></li>
+ <li class="divider" role="presentation"></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="separator">Separated link</a></li>
</ul>
</li>
<li class="dropdown">
<a class="dropdown-toggle" id="drop5" role="button" data-toggle="dropdown" href="#">Dropdown 3 <b class="caret"></b></a>
<ul id="menu3" class="dropdown-menu" role="menu" aria-labelledby="drop5">
- <li><a tabindex="-1" href="#">Action</a></li>
- <li><a tabindex="-1" href="#">Another action</a></li>
- <li><a tabindex="-1" href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a tabindex="-1" href="#">Separated link</a></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="menuitem">Action</a></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="menuitem">Another action</a></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="menuitem">Something else here</a></li>
+ <li role="presentation" class="divider"></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="separator">Separated link</a></li>
</ul>
</li>
</ul> <!-- /tabs -->
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 5ff9fcb82e3b5cdfdaf751575ca4a4d23f2c645b..9cc2d7639aab158f73c519a2751bc5789a815eea 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -335,21 +335,21 @@ $('#myModal').on('hidden', function () {
<li class="dropdown">
<a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown <b class="caret"></b></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
- <li><a tabindex="-1" href="http://google.com">Action</a></li>
- <li><a tabindex="-1" href="#anotherAction">Another action</a></li>
- <li><a tabindex="-1" href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a tabindex="-1" href="#">Separated link</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="http://google.com">Action</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="#anotherAction">Another action</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="#">Something else here</a></li>
+ <li role="presentation" class="divider"></li>
+ <li role="presentation"><a tabindex="-1" role="separator" href="#">Separated link</a></li>
</ul>
</li>
<li class="dropdown">
<a href="#" id="drop2" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown 2 <b class="caret"></b></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="drop2">
- <li><a tabindex="-1" href="#">Action</a></li>
- <li><a tabindex="-1" href="#">Another action</a></li>
- <li><a tabindex="-1" href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a tabindex="-1" href="#">Separated link</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="#">Action</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="#">Another action</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="#">Something else here</a></li>
+ <li class="divider" role="presentation"></li>
+ <li role="presentation"><a tabindex="-1" role="separator" href="#">Separated link</a></li>
</ul>
</li>
</ul>
@@ -357,11 +357,11 @@ $('#myModal').on('hidden', function () {
<li id="fat-menu" class="dropdown">
<a href="#" id="drop3" role="button" class="dropdown-toggle" data-toggle="dropdown">Dropdown 3 <b class="caret"></b></a>
<ul class="dropdown-menu" role="menu" aria-labelledby="drop3">
- <li><a tabindex="-1" href="#">Action</a></li>
- <li><a tabindex="-1" href="#">Another action</a></li>
- <li><a tabindex="-1" href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a tabindex="-1" href="#">Separated link</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="#">Action</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="#">Another action</a></li>
+ <li role="presentation"><a tabindex="-1" role="menuitem" href="#">Something else here</a></li>
+ <li role="presentation" class="divider"></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="separator">Separated link</a></li>
</ul>
</li>
</ul>
@@ -377,31 +377,31 @@ $('#myModal').on('hidden', function () {
<li class="dropdown">
<a class="dropdown-toggle" id="drop4" role="button" data-toggle="dropdown" href="#">Dropdown <b class="caret"></b></a>
<ul id="menu1" class="dropdown-menu" role="menu" aria-labelledby="drop4">
- <li><a tabindex="-1" href="#">Action</a></li>
- <li><a tabindex="-1" href="#">Another action</a></li>
- <li><a tabindex="-1" href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a tabindex="-1" href="#">Separated link</a></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="menuitem">Action</a></li>
+ <li><a tabindex="-1" href="#" role="menuitem">Another action</a></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="menuitem">Something else here</a></li>
+ <li class="divider" role="presentation"></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="separator">Separated link</a></li>
</ul>
</li>
<li class="dropdown">
<a class="dropdown-toggle" id="drop5" 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><a tabindex="-1" href="#">Action</a></li>
- <li><a tabindex="-1" href="#">Another action</a></li>
- <li><a tabindex="-1" href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a tabindex="-1" href="#">Separated link</a></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="menuitem">Action</a></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="menuitem">Another action</a></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="menuitem">Something else here</a></li>
+ <li class="divider" role="presentation"></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="separator">Separated link</a></li>
</ul>
</li>
<li class="dropdown">
<a class="dropdown-toggle" id="drop5" role="button" data-toggle="dropdown" href="#">Dropdown 3 <b class="caret"></b></a>
<ul id="menu3" class="dropdown-menu" role="menu" aria-labelledby="drop5">
- <li><a tabindex="-1" href="#">Action</a></li>
- <li><a tabindex="-1" href="#">Another action</a></li>
- <li><a tabindex="-1" href="#">Something else here</a></li>
- <li class="divider"></li>
- <li><a tabindex="-1" href="#">Separated link</a></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="menuitem">Action</a></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="menuitem">Another action</a></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="menuitem">Something else here</a></li>
+ <li role="presentation" class="divider"></li>
+ <li role="presentation"><a tabindex="-1" href="#" role="separator">Separated link</a></li>
</ul>
</li>
</ul> <!-- /tabs -->
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
index 65fc3ea86a74710a283db30dd66c065d60492a7e..845ca276b30aa5905ca8635b1b312980b9c5ea16 100644
--- a/js/bootstrap-dropdown.js
+++ b/js/bootstrap-dropdown.js
@@ -81,8 +81,10 @@
isActive = $parent.hasClass('open')
- if (!isActive || (isActive && e.keyCode == 27)) return $this.click()
-
+ if (!isActive || (isActive && e.keyCode == 27)) {
+ if(e.keyCode == 27) $parent.find('a[data-toggle=dropdown]')[0].focus() //set focus back to anchor
+ return $this.click()
+ }
$items = $('[role=menu] li:not(.divider):visible a', $parent)
if (!$items.length) return