From 515bcf29335305eef503a6be9920a6e18ebcd57d Mon Sep 17 00:00:00 2001 From: Wesley Cho Date: Sun, 21 Aug 2016 18:38:00 -0700 Subject: [PATCH] fix(collapse): revert change to transition css - Revert change to `getScrollFromElement` function Closes #6196 Fixes #6194 --- src/collapse/collapse.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/collapse/collapse.js b/src/collapse/collapse.js index 853ceb26ff..d809a1df91 100644 --- a/src/collapse/collapse.js +++ b/src/collapse/collapse.js @@ -38,9 +38,9 @@ angular.module('ui.bootstrap.collapse', []) function getScrollFromElement(element) { if (horizontal) { - return {width: ''}; + return {width: element.scrollWidth + 'px'}; } - return {height: ''}; + return {height: element.scrollHeight + 'px'}; } function expand() {