From: Jacob Thornton Date: Fri, 6 Jan 2012 02:32:08 +0000 (-0800) Subject: listen to window for dropdown clear X-Git-Tag: v2.0.0~6^2~364^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=314feb702f9a95ee473e529650e16654714cd9f4;p=thirdparty%2Fbootstrap.git listen to window for dropdown clear --- diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 63791bd37d..6194b88db5 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 15f4677b9d..d846f1af1b 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) })