diff options
| author | Jacob Thornton <[email protected]> | 2012-08-27 21:44:09 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-08-27 21:44:09 -0700 |
| commit | 3568146b28e3eb22e4347062b1e4f923f87daeb8 (patch) | |
| tree | 0d38dabf6739a015bcf83339c8b526ed4b908c6c /docs/assets/js/bootstrap-dropdown.js | |
| parent | 215d92bacd0d912cd9e73e822d928eeb891bf518 (diff) | |
| download | bootstrap-3568146b28e3eb22e4347062b1e4f923f87daeb8.tar.xz bootstrap-3568146b28e3eb22e4347062b1e4f923f87daeb8.zip | |
only stop prop on form – as people seem to be relying on dropdown hiding when clicking internal elements
Diffstat (limited to 'docs/assets/js/bootstrap-dropdown.js')
| -rw-r--r-- | docs/assets/js/bootstrap-dropdown.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js index bd97356d1..42370dfbe 100644 --- a/docs/assets/js/bootstrap-dropdown.js +++ b/docs/assets/js/bootstrap-dropdown.js @@ -110,7 +110,7 @@ if (!selector) { selector = $this.attr('href') - selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 + selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7 } $parent = $(selector) @@ -142,7 +142,7 @@ $('html') .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) $('body') - .on('click.dropdown touchstart.dropdown.data-api', '.dropdown', function (e) { e.stopPropagation() }) + .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) }) |