From: fat <jacobthornton@gmail.com>
Date: Mon, 30 Dec 2013 03:23:15 +0000 (-0800)
Subject: Merge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee... 
X-Git-Tag: v3.1.0~130^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a0b99104c596952bdac6a40053843dfba98534f;p=thirdparty%2Fbootstrap.git

Merge branch 'dropdown-aria-roles' of git://github.com/plumlee/bootstrap into plumlee-dropdown-aria-roles

Conflicts:
	js/dropdown.js
---

2a0b99104c596952bdac6a40053843dfba98534f
diff --cc js/dropdown.js
index b19b255ae0,0a210ef355..1e25403fc0
--- a/js/dropdown.js
+++ b/js/dropdown.js
@@@ -139,7 -149,7 +140,7 @@@
    $(document)
      .on('click.bs.dropdown.data-api', clearMenus)
      .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
 -    .on('click.bs.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
 -    .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu], [role=listbox]' , Dropdown.prototype.keydown)
 +    .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-     .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]', Dropdown.prototype.keydown)
++    .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu], [role=listbox]', Dropdown.prototype.keydown)
  
  }(jQuery);