fixes #11099 - $.collapse() overrides the original dimension of the c…

…ollapsed element when uncollapsing
twbs · Apr 9, 2014 · 5da0bf0 · 5da0bf0
1 parent b3f30bb
commit 5da0bf0
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js
@@ -521,7 +521,7 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
       this.$element
         .removeClass('collapsing')
         .addClass('collapse in')
-        [dimension]('auto')
+        [dimension]('')
       this.transitioning = 0
       this.$element.trigger('shown.bs.collapse')
     }

diff --git a/dist/js/bootstrap.min.js b/dist/js/bootstrap.min.js
diff --git a/docs/assets/js/customize.min.js b/docs/assets/js/customize.min.js
diff --git a/docs/assets/js/raw-files.min.js b/docs/assets/js/raw-files.min.js
diff --git a/docs/dist/js/bootstrap.min.js b/docs/dist/js/bootstrap.min.js
diff --git a/js/collapse.js b/js/collapse.js
@@ -61,7 +61,7 @@
       this.$element
         .removeClass('collapsing')
         .addClass('collapse in')
-        [dimension]('auto')
+        [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 set')
   })
 
   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')