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

Conflicts:
	docs/_includes/js/dropdowns.html

diff --cc docs/_includes/js/dropdowns.html
index 2cbbf85e1983638a375898d99ed2f059376986dc,2f03bddc14a86cda381ae5d1202bc506d619efd0..2260bd38c359b49e1db8c93d7be7396bb7de70e5
--- 1/docs/_includes/js/dropdowns.html
--- 2/docs/_includes/js/dropdowns.html
+++ b/docs/_includes/js/dropdowns.html
@@@ -20,10 -20,7 +20,10 @@@
          <div class="collapse navbar-collapse bs-example-js-navbar-collapse">
            <ul class="nav navbar-nav">
              <li class="dropdown">
-               <button id="drop1" type="button" class="dropdown-toggle" data-toggle="dropdown">
 -              <a id="drop1" href="#" role="button" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
++              <button id="drop1" type="button" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 +                Dropdown
 +                <span class="caret"></span>
 +              </button>
                <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
                  <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Action</a></li>
                  <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Another action</a></li>
@@@ -33,10 -30,7 +33,10 @@@
                </ul>
              </li>
              <li class="dropdown">
-               <button id="drop2" type="button" class="dropdown-toggle" data-toggle="dropdown">
 -              <a href="#" id="drop2" role="button" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropdown 2 <span class="caret"></span></a>
++              <button id="drop2" type="button" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 +                Dropdown 2
 +                <span class="caret"></span>
 +              </button>
                <ul class="dropdown-menu" role="menu" aria-labelledby="drop2">
                  <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Action</a></li>
                  <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Another action</a></li>
@@@ -48,10 -42,7 +48,10 @@@
            </ul>
            <ul class="nav navbar-nav navbar-right">
              <li id="fat-menu" class="dropdown">
-               <button id="drop3" type="button" class="dropdown-toggle" data-toggle="dropdown">
 -              <a href="#" id="drop3" role="button" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Dropdown 3 <span class="caret"></span></a>
++              <button id="drop3" type="button" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 +                Dropdown 3
 +                <span class="caret"></span>
 +              </button>
                <ul class="dropdown-menu" role="menu" aria-labelledby="drop3">
                  <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Action</a></li>
                  <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Another action</a></li>
@@@ -68,13 -59,10 +68,13 @@@
  
    <h3>Within pills</h3>
    <div class="bs-example">
 -    <ul class="nav nav-pills">
 -      <li class="active"><a href="#">Regular link</a></li>
 -      <li class="dropdown">
 -        <a id="drop4" role="button" data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false">Dropdown <span class="caret"></span></a>
 +    <ul class="nav nav-pills" role="tablist">
 +      <li role="presentation" class="active"><a href="#">Regular link</a></li>
 +      <li role="presentation" class="dropdown">
-         <button id="drop4" type="button" data-toggle="dropdown">
++        <button id="drop4" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 +          Dropdown
 +          <span class="caret"></span>
 +        </button>
          <ul id="menu1" class="dropdown-menu" role="menu" aria-labelledby="drop4">
            <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Action</a></li>
            <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Another action</a></li>
@@@ -83,11 -71,8 +83,11 @@@
            <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Separated link</a></li>
          </ul>
        </li>
 -      <li class="dropdown">
 -        <a id="drop5" role="button" data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false">Dropdown 2 <span class="caret"></span></a>
 +      <li role="presentation" class="dropdown">
-         <button id="drop5" type="button" data-toggle="dropdown">
++        <button id="drop5" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 +          Dropdown 2
 +          <span class="caret"></span>
 +        </button>
          <ul id="menu2" class="dropdown-menu" role="menu" aria-labelledby="drop5">
            <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Action</a></li>
            <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Another action</a></li>
@@@ -96,11 -81,8 +96,11 @@@
            <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Separated link</a></li>
          </ul>
        </li>
 -      <li class="dropdown">
 -        <a id="drop6" role="button" data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false">Dropdown 3 <span class="caret"></span></a>
 +      <li role="presentation" class="dropdown">
-         <button id="drop6" type="button" data-toggle="dropdown">
++        <button id="drop6" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 +          Dropdown 3
 +          <span class="caret"></span>
 +        </button>
          <ul id="menu3" class="dropdown-menu" role="menu" aria-labelledby="drop6">
            <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Action</a></li>
            <li role="presentation"><a role="menuitem" tabindex="-1" href="http://twitter.com/fat">Another action</a></li>
@@@ -122,23 -102,20 +122,23 @@@
    <p>Add <code>data-toggle="dropdown"</code> to a link or button to toggle a dropdown.</p>
  {% highlight html %}
  <div class="dropdown">
-   <button id="dLabel" type="button" data-toggle="dropdown">
 -  <a data-toggle="dropdown" href="#" aria-haspopup="true" aria-expanded="false">Dropdown trigger</a>
++  <button id="dLabel" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 +    Dropdown trigger
 +   <span class="caret"></span>
 +  </button>
    <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
      ...
    </ul>
  </div>
  {% endhighlight %}
 -  <p>To keep URLs intact, use the <code>data-target</code> attribute instead of <code>href="#"</code>.</p>
 +  <p>To keep URLs intact with link buttons, use the <code>data-target</code> attribute instead of <code>href="#"</code>.</p>
  {% highlight html %}
  <div class="dropdown">
-   <a id="dLabel" data-target="#" href="http://example.com" type="button" data-toggle="dropdown">
 -  <a id="dLabel" role="button" data-toggle="dropdown" data-target="#" href="/page.html" aria-haspopup="true" aria-expanded="false">
 -    Dropdown <span class="caret"></span>
++  <a id="dLabel" data-target="#" href="http://example.com" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 +    Dropdown trigger
 +    <span class="caret"></span>
    </a>
  
 -
    <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
      ...
    </ul>

diff --cc js/dropdown.js
index 88f118c2d3920668f159b6f5f0d2c18581a15dc3,1924f70ae5c3cdd2be63efab59230ae3e5a4bf47..756fc21f55e8caf5f61810148d1bbd02753232e2
--- 1/js/dropdown.js
--- 2/js/dropdown.js
+++ b/js/dropdown.js
@@@ -88,11 -90,13 +90,17 @@@
      if (e && e.which === 3) return
      $(backdrop).remove()
      $(toggle).each(function () {
-       var $parent = getParent($(this))
 -      var $this = $(this)
 -      var $parent = getParent($this)
++      var $this         = $(this)
++      var $parent       = getParent($this)
        var relatedTarget = { relatedTarget: this }
++
        if (!$parent.hasClass('open')) return
++
        $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
++
        if (e.isDefaultPrevented()) return
++
+       $this.attr('aria-expanded', 'false')
        $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
      })
    }