diff options
| author | Mark Otto <[email protected]> | 2012-01-05 21:43:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-05 21:43:54 -0800 |
| commit | 9bedfa447c52ae45c1a144fba27160811dfb40a2 (patch) | |
| tree | 1adcf039d1a6542f3c7909c2beffb9c10cdcd563 | |
| parent | c56e9d2d35299b4c9e4e3d1aabcf59cedc9143f2 (diff) | |
| parent | 314feb702f9a95ee473e529650e16654714cd9f4 (diff) | |
| download | bootstrap-9bedfa447c52ae45c1a144fba27160811dfb40a2.tar.xz bootstrap-9bedfa447c52ae45c1a144fba27160811dfb40a2.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
| -rw-r--r-- | docs/assets/js/application.js | 9 | ||||
| -rw-r--r-- | js/bootstrap-dropdown.js | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 5fe8b53ef..c31fc97a0 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) }) |