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

Commit a5f83bf

Browse files
pkozlowski-opensourceajoslin
authored andcommitted
fix(alert): various alert fixes
- make the type optional (in this case only a default alert class is applied) - remove the 'alert-block' from a template - it can still be added on the alert element if needed - add replace:true - uncomment a test
1 parent 11348f9 commit a5f83bf

File tree

3 files changed

+17
-8
lines changed

3 files changed

+17
-8
lines changed

src/alert/alert.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,15 @@ angular.module("ui.bootstrap.alert", []).directive('alert', function () {
33
restrict:'EA',
44
templateUrl:'template/alert/alert.html',
55
transclude:true,
6+
replace:true,
67
scope:{
78
type:'=',
89
close:'&'
910
},
1011
link:function (scope, element, attrs) {
11-
scope.type = scope.type || 'info';
1212
scope.dismiss = function () {
1313
scope.close();
1414
};
1515
}
1616
};
17-
});
18-
17+
});

src/alert/test/alert.spec.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,21 @@ describe("alert", function () {
3737
expect(alerts.length).toEqual(3);
3838
});
3939

40-
it("should use correct alert type", function () {
40+
it("should use correct classes for different alert types", function () {
4141
var alerts = createAlerts();
4242
expect(alerts.eq(0)).toHaveClass('alert-success');
4343
expect(alerts.eq(1)).toHaveClass('alert-error');
44-
expect(alerts.eq(2)).toHaveClass('alert-info');
44+
45+
//defaults
46+
expect(alerts.eq(2)).toHaveClass('alert');
47+
expect(alerts.eq(2)).not.toHaveClass('alert-info');
48+
expect(alerts.eq(2)).not.toHaveClass('alert-block');
49+
});
50+
51+
it('it should be possible to add additional classes for alert', function () {
52+
var element = $compile('<alert class="alert-block">Default alert!</alert>')(scope);
53+
scope.$digest();
54+
expect(element).toHaveClass('alert-block');
4555
});
4656

4757
it("should fire callback when closed", function () {

template/alert/alert.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class='alert alert-block' ng-class="'alert-' + type">
2-
<button type='button' class='close' ng-click='dismiss()'>&times;</button>
3-
<div ng-transclude></div>
1+
<div class='alert' ng-class="(type) && 'alert-'+type || undefined">
2+
<button type='button' class='close' ng-click='dismiss()'>&times;</button>
3+
<div ng-transclude></div>
44
</div>

0 commit comments

Comments
 (0)