aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-10-17 23:06:58 -0700
committerJacob Thornton <[email protected]>2012-10-17 23:06:58 -0700
commit0b9d4e78ad5e5ad2f6f34735f0ac73463e1d1af9 (patch)
tree315c0473dccbc3db2df3b4d85f3b27af3e2ec050 /docs
parent7f3b94c45315475a129ace3c22e122808c2dbcaa (diff)
parentd6ac499ca85606d8ce0294d2be3526700605c368 (diff)
downloadbootstrap-0b9d4e78ad5e5ad2f6f34735f0ac73463e1d1af9.tar.xz
bootstrap-0b9d4e78ad5e5ad2f6f34735f0ac73463e1d1af9.zip
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/js/bootstrap-dropdown.js7
-rw-r--r--docs/assets/js/bootstrap.js7
2 files changed, 8 insertions, 6 deletions
diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js
index f50aa64d6..4f99e04ff 100644
--- a/docs/assets/js/bootstrap-dropdown.js
+++ b/docs/assets/js/bootstrap-dropdown.js
@@ -99,9 +99,10 @@
}
- function clearMenus() {
- getParent($(toggle))
- .removeClass('open')
+ function clearMenus() {
+ $(toggle).each(function () {
+ getParent($(this)).removeClass("open")
+ })
}
function getParent($this) {
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js
index 43abb5cc3..be50d9f47 100644
--- a/docs/assets/js/bootstrap.js
+++ b/docs/assets/js/bootstrap.js
@@ -668,9 +668,10 @@
}
- function clearMenus() {
- getParent($(toggle))
- .removeClass('open')
+ function clearMenus() {
+ $(toggle).each(function () {
+ getParent($(this)).removeClass("open")
+ })
}
function getParent($this) {