fix(collapse): fixes after rebase

angular-ui · Dec 28, 2013 · dc02ad1 · dc02ad1
1 parent e0426b9
commit dc02ad1
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/src/collapse/collapse.js b/src/collapse/collapse.js
@@ -30,13 +30,8 @@ angular.module('ui.bootstrap.collapse', ['ui.bootstrap.transition'])
             initialAnimSkip = false;
             expandDone();
           } else {
-            var targetElHeight = element[0].scrollHeight;
-            if (targetElHeight) {
-              element.removeClass('collapse').addClass('collapsing');
-              doTransition({ height: element[0].scrollHeight + 'px' }).then(expandDone);
-            } else {
-              expandDone();
-            }
+            element.removeClass('collapse').addClass('collapsing');
+            doTransition({ height: element[0].scrollHeight + 'px' }).then(expandDone);
           }
         }