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

Commit

Permalink
fix(alert): rename alert-dismissable to alert-dismissible
Browse files Browse the repository at this point in the history
The use of alert-dismissable is now deprecated in correspondence with twbs/bootstrap#13845
  • Loading branch information
RobJacobs authored and Robin van Baalen committed Jun 4, 2015
1 parent 8297244 commit d631af5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/alert/test/alert.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ describe('alert', function () {
}
});

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

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

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

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

it('should be possible to add additional classes for alert', function () {
Expand Down
2 changes: 1 addition & 1 deletion template/alert/alert.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="alert" ng-class="['alert-' + (type || 'warning'), closeable ? 'alert-dismissable' : null]" role="alert">
<div class="alert" ng-class="['alert-' + (type || 'warning'), closeable ? 'alert-dismissible' : null]" role="alert">
<button ng-show="closeable" type="button" class="close" ng-click="close()">
<span aria-hidden="true">&times;</span>
<span class="sr-only">Close</span>
Expand Down

0 comments on commit d631af5

Please sign in to comment.