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

Commit d631af5

Browse files
RobJacobsRobin van Baalen
authored and
Robin van Baalen
committed
fix(alert): rename alert-dismissable to alert-dismissible
The use of alert-dismissable is now deprecated in correspondence with twbs/bootstrap#13845
1 parent 8297244 commit d631af5

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Diff for: src/alert/test/alert.spec.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ describe('alert', function () {
6868
}
6969
});
7070

71-
it('should show close buttons and have the dismissable class', function () {
71+
it('should show close buttons and have the dismissible class', function () {
7272
var alerts = createAlerts();
7373

7474
for (var i = 0, n = alerts.length; i < n; i++) {
7575
expect(findCloseButton(i).css('display')).not.toBe('none');
76-
expect(alerts.eq(i)).toHaveClass('alert-dismissable');
76+
expect(alerts.eq(i)).toHaveClass('alert-dismissible');
7777
}
7878
});
7979

@@ -91,11 +91,11 @@ describe('alert', function () {
9191
expect(scope.removeAlert).toHaveBeenCalledWith(1);
9292
});
9393

94-
it('should not show close button and have the dismissable class if no close callback specified', function () {
94+
it('should not show close button and have the dismissible class if no close callback specified', function () {
9595
element = $compile('<alert>No close</alert>')(scope);
9696
scope.$digest();
9797
expect(findCloseButton(0)).toBeHidden();
98-
expect(element).not.toHaveClass('alert-dismissable');
98+
expect(element).not.toHaveClass('alert-dismissible');
9999
});
100100

101101
it('should be possible to add additional classes for alert', function () {

Diff for: template/alert/alert.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="alert" ng-class="['alert-' + (type || 'warning'), closeable ? 'alert-dismissable' : null]" role="alert">
1+
<div class="alert" ng-class="['alert-' + (type || 'warning'), closeable ? 'alert-dismissible' : null]" role="alert">
22
<button ng-show="closeable" type="button" class="close" ng-click="close()">
33
<span aria-hidden="true">&times;</span>
44
<span class="sr-only">Close</span>

0 commit comments

Comments
 (0)