aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-05 18:32:08 -0800
committerJacob Thornton <[email protected]>2012-01-05 18:32:08 -0800
commit314feb702f9a95ee473e529650e16654714cd9f4 (patch)
tree3cc8ff44697a6b751ce85cfaefa2c85ee47924a6
parent90e3a706ba8c01462516efd3c60cd124620950b9 (diff)
downloadbootstrap-314feb702f9a95ee473e529650e16654714cd9f4.tar.xz
bootstrap-314feb702f9a95ee473e529650e16654714cd9f4.zip
listen to window for dropdown clear
-rw-r--r--docs/assets/js/application.js9
-rw-r--r--js/bootstrap-dropdown.js2
2 files changed, 1 insertions, 10 deletions
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js
index 63791bd37..6194b88db 100644
--- a/docs/assets/js/application.js
+++ b/docs/assets/js/application.js
@@ -15,15 +15,6 @@ $(function(){
}, 0);
- // Docs topbar nav
- // ===============
-
- $('.nav .active').on('click', function (e) {
- e.preventDefault()
- $(this).siblings().toggle()
- });
-
-
// table sort example
// ==================
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
index 15f4677b9..d846f1af1 100644
--- a/js/bootstrap-dropdown.js
+++ b/js/bootstrap-dropdown.js
@@ -74,7 +74,7 @@
* =================================== */
$(function () {
- $('html').on('click.dropdown.data-api', clearMenus)
+ $(window).on('click.dropdown.data-api', clearMenus)
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
})