aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-03-12 13:37:44 -0700
committerJacob Thornton <[email protected]>2012-03-12 13:37:44 -0700
commit56fe54df4385bfa186b82da443b14920ea2b16ee (patch)
tree457497389340a956c02af970ad3dea85fd07f305
parentcd89c34d99f839be73e9179385d4da29de026431 (diff)
downloadbootstrap-56fe54df4385bfa186b82da443b14920ea2b16ee.tar.xz
bootstrap-56fe54df4385bfa186b82da443b14920ea2b16ee.zip
remove collapse class on open so that dropdowns are viewable
-rw-r--r--docs/assets/bootstrap.zipbin55576 -> 55592 bytes
-rw-r--r--docs/assets/js/bootstrap-collapse.js4
-rw-r--r--js/bootstrap-collapse.js4
3 files changed, 6 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index d36eb3885..24e5a3124 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/js/bootstrap-collapse.js b/docs/assets/js/bootstrap-collapse.js
index d195efc72..2139d6703 100644
--- a/docs/assets/js/bootstrap-collapse.js
+++ b/docs/assets/js/bootstrap-collapse.js
@@ -74,7 +74,9 @@
[dimension](size || 'auto')
[0].offsetWidth
- this.$element.addClass('collapse')
+ this.$element[size ? 'addClass' : 'removeClass']('collapse')
+
+ return this
}
, transition: function ( method, startEvent, completeEvent ) {
diff --git a/js/bootstrap-collapse.js b/js/bootstrap-collapse.js
index d195efc72..2139d6703 100644
--- a/js/bootstrap-collapse.js
+++ b/js/bootstrap-collapse.js
@@ -74,7 +74,9 @@
[dimension](size || 'auto')
[0].offsetWidth
- this.$element.addClass('collapse')
+ this.$element[size ? 'addClass' : 'removeClass']('collapse')
+
+ return this
}
, transition: function ( method, startEvent, completeEvent ) {