fixes #9543

c0eabdda · fat · d754e656 · c0eabdda · c0eabdda · c0eabdda
Commit c0eabdda authored 11 years ago by fat
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 3 deletions
+3 -3
--- a/dist/js/bootstrap.js
+++ b/dist/js/bootstrap.js
@@ -711,7 +711,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
    clearMenus()

    if (!isActive) {
-      if ('ontouchstart' in document.documentElement) {
+      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
        // if mobile we we use a backdrop because click events don't delegate
        $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
      }

--- a/dist/js/bootstrap.min.js
+++ b/dist/js/bootstrap.min.js
--- a/js/dropdown.js
+++ b/js/dropdown.js
@@ -40,7 +40,7 @@
    clearMenus()

    if (!isActive) {
-      if ('ontouchstart' in document.documentElement) {
+      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
        // if mobile we we use a backdrop because click events don't delegate
        $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
      }