dropdown.js in bootstrap-sass-rails-3.0.0.0

- old
+ new

@@ -38,11 +38,11 @@
     var isActive = $parent.hasClass('open')
 
     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)
       }
 
       $parent.trigger(e = $.Event('show.bs.dropdown'))
@@ -50,12 +50,12 @@
       if (e.isDefaultPrevented()) return
 
       $parent
         .toggleClass('open')
         .trigger('shown.bs.dropdown')
-    }
 
-    $this.focus()
+      $this.focus()
+    }
 
     return false
   }
 
   Dropdown.prototype.keydown = function (e) {