Merge pull request #13306 from twbs/fat-11099

fixes #11099 - $.collapse() overrides the original dimension of the coll...
twbs · Apr 20, 2014 · b02d3c7 · b02d3c7
2 parents 4f427cb + cd4696f
commit b02d3c7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/js/collapse.js b/js/collapse.js
@@ -63,7 +63,7 @@
       }
       this.$element
         .removeClass('collapsing')
-        .addClass('collapse in')[dimension]('auto')
+        .addClass('collapse in')[dimension]('')
       this.transitioning = 0
       this.$element.trigger('shown.bs.collapse')
     }

diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js
@@ -19,7 +19,7 @@ $(function () {
   test('should show a collapsed element', function () {
     var el = $('<div class="collapse"></div>').collapse('show')
     ok(el.hasClass('in'), 'has class in')
-    ok(/height/.test(el.attr('style')), 'has height set')
+    ok(!/height/.test(el.attr('style')), 'has height reset')
   })
 
   test('should hide a collapsed element', function () {
@@ -51,7 +51,7 @@ $(function () {
         ok(this.style.height == '0px')
       })
       .on('shown.bs.collapse', function () {
-        ok(this.style.height == 'auto')
+        ok(this.style.height === '')
         start()
       })
       .collapse('show')