Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Commit 4af83ad

Browse files
uberspeckwesleycho
authored andcommitted
feat(dropdown): add dropdown classes dynamically
- Add `dropdown` and `dropdown-toggle` classes dynamically for template simplification Closes #3984 Closes #3986
1 parent 2332f14 commit 4af83ad

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

src/dropdown/docs/demo.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
<div ng-controller="DropdownCtrl">
33
<!-- Simple dropdown -->
4-
<span class="dropdown" dropdown on-toggle="toggled(open)">
5-
<a href id="simple-dropdown" class="dropdown-toggle" dropdown-toggle>
4+
<span dropdown on-toggle="toggled(open)">
5+
<a href id="simple-dropdown" dropdown-toggle>
66
Click me for a dropdown, yo!
77
</a>
88
<ul class="dropdown-menu" aria-labelledby="simple-dropdown">
@@ -14,7 +14,7 @@
1414

1515
<!-- Single button -->
1616
<div class="btn-group" dropdown is-open="status.isopen">
17-
<button id="single-button" type="button" class="btn btn-primary dropdown-toggle" dropdown-toggle ng-disabled="disabled">
17+
<button id="single-button" type="button" class="btn btn-primary" dropdown-toggle ng-disabled="disabled">
1818
Button dropdown <span class="caret"></span>
1919
</button>
2020
<ul class="dropdown-menu" role="menu" aria-labelledby="single-button">
@@ -29,7 +29,7 @@
2929
<!-- Split button -->
3030
<div class="btn-group" dropdown>
3131
<button id="split-button" type="button" class="btn btn-danger">Action</button>
32-
<button type="button" class="btn btn-danger dropdown-toggle" dropdown-toggle>
32+
<button type="button" class="btn btn-danger" dropdown-toggle>
3333
<span class="caret"></span>
3434
<span class="sr-only">Split button!</span>
3535
</button>
@@ -44,7 +44,7 @@
4444

4545
<!-- Single button using append-to-body -->
4646
<div class="btn-group" dropdown dropdown-append-to-body>
47-
<button id="btn-append-to-body" type="button" class="btn btn-primary dropdown-toggle" dropdown-toggle>
47+
<button id="btn-append-to-body" type="button" class="btn btn-primary" dropdown-toggle>
4848
Dropdown on Body <span class="caret"></span>
4949
</button>
5050
<ul class="dropdown-menu" role="menu" aria-labelledby="btn-append-to-body">
@@ -58,7 +58,7 @@
5858

5959
<!-- Single button using template-url -->
6060
<div class="btn-group" dropdown>
61-
<button id="button-template-url" type="button" class="btn btn-primary dropdown-toggle" dropdown-toggle ng-disabled="disabled">
61+
<button id="button-template-url" type="button" class="btn btn-primary" dropdown-toggle ng-disabled="disabled">
6262
Dropdown using template <span class="caret"></span>
6363
</button>
6464
<ul class="dropdown-menu" template-url="dropdown.html" aria-labelledby="button-template-url">
@@ -74,7 +74,7 @@
7474
<hr>
7575
<!-- Single button with keyboard nav -->
7676
<div class="btn-group" dropdown keyboard-nav>
77-
<button id="simple-btn-keyboard-nav" type="button" class="btn btn-primary dropdown-toggle" dropdown-toggle>
77+
<button id="simple-btn-keyboard-nav" type="button" class="btn btn-primary" dropdown-toggle>
7878
Dropdown with keyboard navigation <span class="caret"></span>
7979
</button>
8080
<ul class="dropdown-menu" role="menu" aria-labelledby="simple-btn-keyboard-nav">

src/dropdown/dropdown.js

+3
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.position'])
234234
controller: 'DropdownController',
235235
link: function(scope, element, attrs, dropdownCtrl) {
236236
dropdownCtrl.init( element );
237+
element.addClass('dropdown');
237238
}
238239
};
239240
})
@@ -303,6 +304,8 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.position'])
303304
return;
304305
}
305306

307+
element.addClass('dropdown-toggle');
308+
306309
dropdownCtrl.toggleElement = element;
307310

308311
var toggleDropdown = function(event) {

0 commit comments

Comments
 (0)