Merge pull request ember-bootstrap#754 from kaliber5/collapse-transition

Fix transition for bs-collapse
jelhan · Feb 16, 2019 · 8ebeb26 · 8ebeb26
2 parents 589273c + 0c6a7db
commit 8ebeb26
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/addon/components/base/bs-collapse.js b/addon/components/base/bs-collapse.js
@@ -113,8 +113,8 @@ export default Component.extend({
    */
   transitionDuration: 350,
 
-  setCollapseSize() {
-    let { collapseSize: size, collapseDimension: dimension } = this.getProperties('collapseSize', 'collapseDimension');
+  setCollapseSize(size) {
+    let dimension = this.get('collapseDimension');
 
     assert(`collapseDimension must be either "width" or "height". ${dimension} given.`, ["width", "height"].includes(dimension));
 
@@ -165,9 +165,9 @@ export default Component.extend({
 
     this.setProperties({
       transitioning: true,
-      collapseSize: this.get('collapsedSize'),
       active: true
     });
+    this.setCollapseSize(this.get('collapsedSize'));
 
     transitionEnd(this.get('element'), this.get('transitionDuration')).then(() => {
       if (this.get('isDestroyed')) {