diff options
| author | fat-kun <[email protected]> | 2013-02-05 20:08:42 -0800 |
|---|---|---|
| committer | fat-kun <[email protected]> | 2013-02-05 20:08:42 -0800 |
| commit | 566380b257e5322a014fe52f935381ff86637f43 (patch) | |
| tree | 9648370fb373459a1f8f582f2e31c2e14d2efba8 | |
| parent | c25e8182baacfea77c15aba1e03e447297a26b84 (diff) | |
| parent | b5ad50686c892c5fb8d0e58571b9dc0b77b4f0d2 (diff) | |
| download | bootstrap-566380b257e5322a014fe52f935381ff86637f43.tar.xz bootstrap-566380b257e5322a014fe52f935381ff86637f43.zip | |
Merge pull request #6488 from nanek/dropdowns-remove-touchstart
Remove touchstart from bootstrap-dropdown.js.
| -rw-r--r-- | js/bootstrap-dropdown.js | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js index b8c585283..ec86cf0d7 100644 --- a/js/bootstrap-dropdown.js +++ b/js/bootstrap-dropdown.js @@ -156,10 +156,10 @@ * =================================== */ $(document) - .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus) - .on('click.dropdown.data-api touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) - .on('touchstart.dropdown.data-api', '.dropdown-menu', 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) + .on('click.dropdown.data-api', clearMenus) + .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) + .on('.dropdown-menu', function (e) { e.stopPropagation() }) + .on('click.dropdown.data-api' , toggle, Dropdown.prototype.toggle) + .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown) -}(window.jQuery);
\ No newline at end of file +}(window.jQuery); |