diff options
| author | Jacob Thornton <[email protected]> | 2012-10-17 23:05:16 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-10-17 23:05:16 -0700 |
| commit | 7f3b94c45315475a129ace3c22e122808c2dbcaa (patch) | |
| tree | 0b963ce17c8bd8c5f43356da36015daee7295ede /docs/assets/js/bootstrap-dropdown.js | |
| parent | 280d4aeb30aa6b29ec74bd801ad1be3fc05e01f4 (diff) | |
| parent | e1f6458e3640a628cdb6b2e4c63950777d46e141 (diff) | |
| download | bootstrap-7f3b94c45315475a129ace3c22e122808c2dbcaa.tar.xz bootstrap-7f3b94c45315475a129ace3c22e122808c2dbcaa.zip | |
Merge branch 'delegate-api-to-document' of git://github.com/badcarl/bootstrap into badcarl-delegate-api-to-document
Conflicts:
js/bootstrap-carousel.js
Diffstat (limited to 'docs/assets/js/bootstrap-dropdown.js')
| -rw-r--r-- | docs/assets/js/bootstrap-dropdown.js | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js index 0ef9b0f9d..f50aa64d6 100644 --- a/docs/assets/js/bootstrap-dropdown.js +++ b/docs/assets/js/bootstrap-dropdown.js @@ -138,13 +138,10 @@ /* APPLY TO STANDARD DROPDOWN ELEMENTS * =================================== */ - $(function () { - $('html') - .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) - $('body') - .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle) - .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) - }) + $(document) + .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) + .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle) + .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) }(window.jQuery);
\ No newline at end of file |