Merge pull request #362 from purcell/safe-dropdown-initialization

Add jquery.ready hook after defining plugin, to avoid breakage with modernizr/yepnope
twbs · Oct 3, 2011 · b41175f · b41175f
2 parents 7e01ff8 + bdbb1c9
commit b41175f
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
@@ -20,17 +20,6 @@
 
 !function( $ ){
 
-  var d = 'a.menu, .dropdown-toggle'
-
-  function clearMenus() {
-    $(d).parent('li').removeClass('open')
-  }
-
-  $(function () {
-    $('html').bind("click", clearMenus)
-    $('body').dropdown( '[data-dropdown] a.menu, [data-dropdown] .dropdown-toggle' )
-  })
-
   /* DROPDOWN PLUGIN DEFINITION
    * ========================== */
 
@@ -47,4 +36,18 @@
     })
   }
 
-}( window.jQuery || window.ender );
+  /* APPLY TO STANDARD DROPDOWN ELEMENTS
+   * =================================== */
+
+  var d = 'a.menu, .dropdown-toggle'
+
+  function clearMenus() {
+    $(d).parent('li').removeClass('open')
+  }
+
+  $(function () {
+    $('html').bind("click", clearMenus)
+    $('body').dropdown( '[data-dropdown] a.menu, [data-dropdown] .dropdown-toggle' )
+  })
+
+}( window.jQuery || window.ender );