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

fix(collapse): handling when the content has height zero #2859

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/collapse/collapse.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,12 @@ angular.module('ui.bootstrap.collapse', ['ui.bootstrap.transition'])
expandDone();
} else {
element.removeClass('collapse').addClass('collapsing');
doTransition({ height: element[0].scrollHeight + 'px' }).then(expandDone);
if(element[0].scrollHeight === 0) {
expandDone();
}
else {
doTransition({ height: element[0].scrollHeight + 'px' }).then(expandDone);
}
}
}

Expand Down
18 changes: 16 additions & 2 deletions src/collapse/test/collapse.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe('collapse directive', function () {
}));

beforeEach(function() {
element = $compile('<div collapse="isCollapsed">Some Content</div>')(scope);
element = $compile('<div collapse="isCollapsed" ng-hide="hideContent">Some Content</div>')(scope);
angular.element(document.body).append(element);
});

Expand Down Expand Up @@ -71,6 +71,20 @@ describe('collapse directive', function () {
}
});

it('should also set height:auto on isCollapsed = false, even if there is no content', function() {
scope.hideContent = true;
scope.isCollapsed = true;
scope.$digest();
expect(element.height()).toBe(0);
scope.isCollapsed = false;
scope.$digest();
expect(element.height()).toBe(0);
scope.hideContent = false;
scope.$digest();
expect(element.height()).toBeGreaterThan(0);
});


describe('dynamic content', function() {

var element;
Expand Down Expand Up @@ -106,4 +120,4 @@ describe('collapse directive', function () {
});

});
});
});