diff options
| author | Patrick H. Lauke <[email protected]> | 2015-06-02 09:41:40 +0100 |
|---|---|---|
| committer | Patrick H. Lauke <[email protected]> | 2015-06-02 11:03:21 +0100 |
| commit | 5fd7bc1554d492bdd5794d35fce515fe951439a6 (patch) | |
| tree | 61ac7cd8243c6d6c4c6e8de4b373132b01419df7 /docs/_includes/components/dropdowns.html | |
| parent | 3b59b97c626bf2accef8217339b04712666c36d9 (diff) | |
| download | bootstrap-5fd7bc1554d492bdd5794d35fce515fe951439a6.tar.xz bootstrap-5fd7bc1554d492bdd5794d35fce515fe951439a6.zip | |
generalize dropdowns / drop role="menu"
as role="menu" is a very specific (and strict) ARIA pattern for
desktop-like application menus, and our dropdowns are often used
as pure navigation dropdowns, this change abandons ARIA menus for
a more open-ended and light-weight approach
(see http://heydonworks.com/practical_aria_examples/#submenus and
http://www.w3.org/WAI/tutorials/menus/flyout/#improve-screen-reader-support-using-wai-aria)
note that in dropdown.js, switched to now target ``.dropdown-menu``
instead of ``role["menu"]`` - this also prevents bootstrap scripts
from "bleeding" into non-bootstrap components on the same page.
also removed the ``role=["listbox"]`` part, which appears to be
vestigial/unused (only place in bootstrap that uses that
role are carousels, and their key handling is done separately)
Diffstat (limited to 'docs/_includes/components/dropdowns.html')
| -rw-r--r-- | docs/_includes/components/dropdowns.html | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/docs/_includes/components/dropdowns.html b/docs/_includes/components/dropdowns.html index c2bfeb3d5..c5554b803 100644 --- a/docs/_includes/components/dropdowns.html +++ b/docs/_includes/components/dropdowns.html @@ -7,28 +7,28 @@ <p>Wrap the dropdown's trigger and the dropdown menu within <code>.dropdown</code>, or another element that declares <code>position: relative;</code>. Then add the menu's HTML.</p> <div class="bs-example" data-example-id="static-dropdown"> <div class="dropdown clearfix"> - <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-expanded="true"> + <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> Dropdown <span class="caret"></span> </button> - <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1"> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li> + <ul class="dropdown-menu" aria-labelledby="dropdownMenu1"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> </ul> </div> </div><!-- /example --> {% highlight html %} <div class="dropdown"> - <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-expanded="true"> + <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> Dropdown <span class="caret"></span> </button> - <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu1"> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li> + <ul class="dropdown-menu" aria-labelledby="dropdownMenu1"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li><a href="#">Separated link</a></li> </ul> </div> {% endhighlight %} @@ -36,28 +36,28 @@ <p>Dropdown menus can be changed to expand upwards (instead of downwards) by adding <code>.dropup</code> to the parent.</p> <div class="bs-example" data-example-id="static-dropup"> <div class="dropup clearfix"> - <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-expanded="true"> + <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Dropup <span class="caret"></span> </button> - <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2"> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li> + <ul class="dropdown-menu" aria-labelledby="dropdownMenu2"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> </ul> </div> </div><!-- /example --> {% highlight html %} <div class="dropup"> - <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-expanded="true"> + <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Dropup <span class="caret"></span> </button> - <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu2"> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li> + <ul class="dropdown-menu" aria-labelledby="dropdownMenu2"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li><a href="#">Separated link</a></li> </ul> </div> {% endhighlight %} @@ -73,7 +73,7 @@ <p>As of v3.1.0, we've deprecated <code>.pull-right</code> on dropdown menus. To right-align a menu, use <code>.dropdown-menu-right</code>. Right-aligned nav components in the navbar use a mixin version of this class to automatically align the menu. To override it, use <code>.dropdown-menu-left</code>.</p> </div> {% highlight html %} -<ul class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="dLabel"> +<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dLabel"> ... </ul> {% endhighlight %} @@ -82,24 +82,24 @@ <p>Add a header to label sections of actions in any dropdown menu.</p> <div class="bs-example"> <div class="dropdown clearfix"> - <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu3" data-toggle="dropdown" aria-expanded="true"> + <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu3" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> Dropdown <span class="caret"></span> </button> - <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu3"> - <li role="presentation" class="dropdown-header">Dropdown header</li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li> - <li role="presentation" class="dropdown-header">Dropdown header</li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li> + <ul class="dropdown-menu" aria-labelledby="dropdownMenu3"> + <li class="dropdown-header">Dropdown header</li> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="dropdown-header">Dropdown header</li> + <li><a href="#">Separated link</a></li> </ul> </div> </div><!-- /example --> {% highlight html %} -<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu3"> +<ul class="dropdown-menu" aria-labelledby="dropdownMenu3"> ... - <li role="presentation" class="dropdown-header">Dropdown header</li> + <li class="dropdown-header">Dropdown header</li> ... </ul> {% endhighlight %} @@ -108,21 +108,21 @@ <p>Add a divider to separate series of links in a dropdown menu.</p> <div class="bs-example"> <div class="dropdown clearfix"> - <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenuDivider" data-toggle="dropdown" aria-expanded="true"> + <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenuDivider" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> Dropdown <span class="caret"></span> </button> - <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenuDivider"> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Action</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another action</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Something else here</a></li> + <ul class="dropdown-menu" aria-labelledby="dropdownMenuDivider"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> <li role="separator" class="divider"></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Separated link</a></li> + <li><a href="#">Separated link</a></li> </ul> </div> </div><!-- /example --> {% highlight html %} -<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenuDivider"> +<ul class="dropdown-menu" aria-labelledby="dropdownMenuDivider"> ... <li role="separator" class="divider"></li> ... @@ -133,22 +133,22 @@ <p>Add <code>.disabled</code> to a <code><li></code> in the dropdown to disable the link.</p> <div class="bs-example"> <div class="dropdown clearfix"> - <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu4" data-toggle="dropdown" aria-expanded="true"> + <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu4" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> Dropdown <span class="caret"></span> </button> - <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu4"> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Regular link</a></li> - <li role="presentation" class="disabled"><a role="menuitem" tabindex="-1" href="#">Disabled link</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another link</a></li> + <ul class="dropdown-menu" aria-labelledby="dropdownMenu4"> + <li><a href="#">Regular link</a></li> + <li class="disabled"><a href="#">Disabled link</a></li> + <li><a href="#">Another link</a></li> </ul> </div> </div><!-- /example --> {% highlight html %} -<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu4"> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Regular link</a></li> - <li role="presentation" class="disabled"><a role="menuitem" tabindex="-1" href="#">Disabled link</a></li> - <li role="presentation"><a role="menuitem" tabindex="-1" href="#">Another link</a></li> +<ul class="dropdown-menu" aria-labelledby="dropdownMenu4"> + <li><a href="#">Regular link</a></li> + <li class="disabled"><a href="#">Disabled link</a></li> + <li><a href="#">Another link</a></li> </ul> {% endhighlight %} </div> |
