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

Commit

Permalink
feat(alert): allow alerts to be closed from a controller
Browse files Browse the repository at this point in the history
Closes #2399
Closes #2854
  • Loading branch information
pkozlowski-opensource committed Oct 19, 2014
1 parent c9baf00 commit ca6fad6
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 1 deletion.
14 changes: 13 additions & 1 deletion src/alert/alert.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ angular.module('ui.bootstrap.alert', [])

.controller('AlertController', ['$scope', '$attrs', function ($scope, $attrs) {
$scope.closeable = 'close' in $attrs;
this.close = $scope.close;
}])

.directive('alert', function () {
Expand All @@ -16,4 +17,15 @@ angular.module('ui.bootstrap.alert', [])
close: '&'
}
};
});
})

.directive('dismissOnTimeout', ['$timeout', function($timeout) {
return {
require: 'alert',
link: function(scope, element, attrs, alertCtrl) {
$timeout(function(){
alertCtrl.close();
}, parseInt(attrs.dismissOnTimeout, 10));
}
};
}]);
21 changes: 21 additions & 0 deletions src/alert/test/dismissOnTimeout.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
describe('dismissOnTimeout', function () {

var scope, $compile, $timeout;

beforeEach(module('ui.bootstrap.alert'));
beforeEach(module('template/alert/alert.html'));
beforeEach(inject(function ($rootScope, _$compile_, _$timeout_) {
scope = $rootScope;
$compile = _$compile_;
$timeout = _$timeout_;
}));

it('should close automatically if auto-dismiss is defined on the element', function () {
scope.removeAlert = jasmine.createSpy();
$compile('<alert close="removeAlert()" dismiss-on-timeout="500">Default alert!</alert>')(scope);
scope.$digest();

$timeout.flush();
expect(scope.removeAlert).toHaveBeenCalled();
});
});

0 comments on commit ca6fad6

Please sign in to comment.