Merge pull request #6488 from nanek/dropdowns-remove-touchstart

Remove touchstart from bootstrap-dropdown.js.

Merge pull request #6488 from nanek/dropdowns-remove-touchstart
Remove touchstart from bootstrap-dropdown.js.
566380b2 · fat-kun · c25e8182 · b5ad5068 · 566380b2
Commit 566380b2 authored 12 years ago by fat-kun
Hide whitespace changes
Inline Side-by-side

Showing

with 6 additions and 6 deletions
+6 -6
--- 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);