Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip

1 files changed, 15 insertions, 12 deletions

diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
index 75320c0f8..6379653c5 100644
--- a/js/bootstrap-dropdown.js
+++ b/js/bootstrap-dropdown.js
@@ -20,23 +20,14 @@
 
 (function( $ ){
 
-  var d = '.dropdown-toggle'
-
-  function clearMenus() {
-    $(d).parent('li').removeClass('open')
-  }
-
-  $(function () {
-    $('html').bind("click", clearMenus)
-    $('body').dropdown( '[data-dropdown] .dropdown-toggle' )
-  })
+  var d = '[data-dropdown]'
 
   /* DROPDOWN PLUGIN DEFINITION
    * ========================== */
 
-  $.fn.dropdown = function ( selector ) {
+  $.fn.dropdown = function () {
     return this.each(function () {
-      $(this).delegate(selector || d, 'click', function (e) {
+      $(this).delegate(d, 'click', function (e) {
         var li = $(this).parent('li')
           , isActive = li.hasClass('open')
 
@@ -47,4 +38,16 @@
     })
   }
 
+  /* APPLY TO STANDARD DROPDOWN ELEMENTS
+   * =================================== */
+
+  function clearMenus() {
+    $(d).parent('li').removeClass('open')
+  }
+
+  $(function () {
+    $('html').bind("click", clearMenus)
+    $('body').dropdown()
+  })
+
 })( window.jQuery || window.ender )
\ No newline at end of file