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

Commit 5ad08ff

Browse files
committed
fix(collapse): set initial state to avoid animation
- Ensure animation does not occur when first loaded Closes #5075 Fixes #4848 Fixes #4885
1 parent 000d6c3 commit 5ad08ff

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

src/collapse/collapse.js

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ angular.module('ui.bootstrap.collapse', [])
44
var $animateCss = $injector.has('$animateCss') ? $injector.get('$animateCss') : null;
55
return {
66
link: function(scope, element, attrs) {
7+
if (!scope.$eval(attrs.uibCollapse)) {
8+
element.addClass('in')
9+
.addClass('collapse')
10+
.css({height: 'auto'});
11+
}
12+
713
function expand() {
814
element.removeClass('collapse')
915
.addClass('collapsing')

src/collapse/test/collapse.spec.js

+10-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
describe('collapse directive', function() {
2-
var element, scope, $compile, $animate;
2+
var element, compileFn, scope, $compile, $animate;
33

44
beforeEach(module('ui.bootstrap.collapse'));
55
beforeEach(module('ngAnimateMock'));
@@ -10,7 +10,8 @@ describe('collapse directive', function() {
1010
}));
1111

1212
beforeEach(function() {
13-
element = $compile('<div uib-collapse="isCollapsed">Some Content</div>')(scope);
13+
element = angular.element('<div uib-collapse="isCollapsed">Some Content</div>');
14+
compileFn = $compile(element);
1415
angular.element(document.body).append(element);
1516
});
1617

@@ -20,12 +21,14 @@ describe('collapse directive', function() {
2021

2122
it('should be hidden on initialization if isCollapsed = true', function() {
2223
scope.isCollapsed = true;
24+
compileFn(scope);
2325
scope.$digest();
2426
expect(element.height()).toBe(0);
2527
});
2628

2729
it('should collapse if isCollapsed = true on subsequent use', function() {
2830
scope.isCollapsed = false;
31+
compileFn(scope);
2932
scope.$digest();
3033
$animate.flush();
3134
scope.isCollapsed = true;
@@ -36,13 +39,15 @@ describe('collapse directive', function() {
3639

3740
it('should be shown on initialization if isCollapsed = false', function() {
3841
scope.isCollapsed = false;
42+
compileFn(scope);
3943
scope.$digest();
4044
$animate.flush();
4145
expect(element.height()).not.toBe(0);
4246
});
4347

4448
it('should expand if isCollapsed = false on subsequent use', function() {
4549
scope.isCollapsed = false;
50+
compileFn(scope);
4651
scope.$digest();
4752
$animate.flush();
4853
scope.isCollapsed = true;
@@ -56,6 +61,7 @@ describe('collapse directive', function() {
5661

5762
it('should expand if isCollapsed = true on subsequent uses', function() {
5863
scope.isCollapsed = false;
64+
compileFn(scope);
5965
scope.$digest();
6066
$animate.flush();
6167
scope.isCollapsed = true;
@@ -72,6 +78,7 @@ describe('collapse directive', function() {
7278

7379
it('should change aria-expanded attribute', function() {
7480
scope.isCollapsed = false;
81+
compileFn(scope);
7582
scope.$digest();
7683
$animate.flush();
7784
expect(element.attr('aria-expanded')).toBe('true');
@@ -84,6 +91,7 @@ describe('collapse directive', function() {
8491

8592
it('should change aria-hidden attribute', function() {
8693
scope.isCollapsed = false;
94+
compileFn(scope);
8795
scope.$digest();
8896
$animate.flush();
8997
expect(element.attr('aria-hidden')).toBe('false');

0 commit comments

Comments
 (0)