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

fat · fat · commit 0b9d4e78ad5e · 2012-10-17T23:06:58.000-07:00
diff --git a/docs/assets/js/bootstrap-dropdown.js b/docs/assets/js/bootstrap-dropdown.js
@@ -99,9 +99,10 @@
 
   }
 
-  function clearMenus() {
-    getParent($(toggle))
-      .removeClass('open')
+  function clearMenus() { 
+    $(toggle).each(function () { 
+      getParent($(this)).removeClass("open")
+    })
   }
 
   function getParent($this) {
diff --git a/docs/assets/js/bootstrap.js b/docs/assets/js/bootstrap.js
@@ -668,9 +668,10 @@
 
   }
 
-  function clearMenus() {
-    getParent($(toggle))
-      .removeClass('open')
+  function clearMenus() { 
+    $(toggle).each(function () { 
+      getParent($(this)).removeClass("open")
+    })
   }
 
   function getParent($this) {
diff --git a/js/bootstrap-dropdown.js b/js/bootstrap-dropdown.js
@@ -99,9 +99,10 @@
 
   }
 
-  function clearMenus() {
-    getParent($(toggle))
-      .removeClass('open')
+  function clearMenus() { 
+    $(toggle).each(function () { 
+      getParent($(this)).removeClass("open")
+    })
   }
 
   function getParent($this) {
diff --git a/js/tests/unit/bootstrap-dropdown.js b/js/tests/unit/bootstrap-dropdown.js
@@ -7,7 +7,8 @@ $(function () {
       })
 
       test("should return element", function () {
-        ok($(document.body).dropdown()[0] == document.body, 'document.body returned')
+        var el = $("<div />")
+        ok(el.dropdown()[0] === el[0], 'same element returned')
       })
 
       test("should not open dropdown if target is disabled", function () {
@@ -102,4 +103,43 @@ $(function () {
         dropdown.remove()
       })
 
+      test("should remove open class if body clicked, with multiple drop downs", function () {
+          var dropdownHTML = 
+            '<ul class="nav">'
+            + '    <li><a href="#menu1">Menu 1</a></li>'
+            + '    <li class="dropdown" id="testmenu">'
+            + '      <a class="dropdown-toggle" data-toggle="dropdown" href="#testmenu">Test menu <b class="caret"></b></a>'
+            + '      <ul class="dropdown-menu" role="menu">'
+            + '        <li><a href="#sub1">Submenu 1</a></li>'
+            + '      </ul>'
+            + '    </li>'
+            + '</ul>'
+            + '<div class="btn-group">'
+            + '    <button class="btn">Actions</button>'
+            + '    <button class="btn dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>'
+            + '    <ul class="dropdown-menu">'
+            + '        <li><a href="#">Action 1</a></li>'
+            + '    </ul>'
+            + '</div>'
+          , dropdowns = $(dropdownHTML).appendTo('#qunit-fixture').find('[data-toggle="dropdown"]')
+          , first = dropdowns.first()
+          , last = dropdowns.last()
+
+        ok(dropdowns.length == 2, "Should be two dropdowns")
+          
+        first.click()
+        ok(first.parents('.open').length == 1, 'open class added on click')
+        ok($('#qunit-fixture .open').length == 1, 'only one object is open')
+        $('body').click()
+        ok($("#qunit-fixture .open").length === 0, 'open class removed')
+
+        last.click()
+        ok(last.parent('.open').length == 1, 'open class added on click')
+        ok($('#qunit-fixture .open').length == 1, 'only one object is open')
+        $('body').click()
+        ok($("#qunit-fixture .open").length === 0, 'open class removed')
+
+        $("#qunit-fixture").html("")
+      })
+
 })

Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,10 @@`
`99`	`99`
`100`	`100`	`}`
`101`	`101`
`102`		`- function clearMenus() {`
`103`		`- getParent($(toggle))`
`104`		`- .removeClass('open')`
	`102`	`+ function clearMenus() {`
	`103`	`+ $(toggle).each(function () {`
	`104`	`+ getParent($(this)).removeClass("open")`
	`105`	`+ })`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`function getParent($this) {`
Original file line number	Diff line number	Diff line change
`@@ -668,9 +668,10 @@`
`668`	`668`
`669`	`669`	`}`
`670`	`670`
`671`		`- function clearMenus() {`
`672`		`- getParent($(toggle))`
`673`		`- .removeClass('open')`
	`671`	`+ function clearMenus() {`
	`672`	`+ $(toggle).each(function () {`
	`673`	`+ getParent($(this)).removeClass("open")`
	`674`	`+ })`
`674`	`675`	`}`
`675`	`676`
`676`	`677`	`function getParent($this) {`