aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-07-31 10:27:52 -0700
committerMark Otto <[email protected]>2013-07-31 10:27:52 -0700
commitf43fa23ae0bacee23c19a65e39b96b3a21b9adf1 (patch)
tree155596182903584da7a78f708dd90ff981cdc62e /js
parent29b36bf962d8fb553516ddc865951a80deb7b347 (diff)
parentd7d0f226f9e31eea349f37d25a26c8674b63a642 (diff)
downloadbootstrap-f43fa23ae0bacee23c19a65e39b96b3a21b9adf1.tar.xz
bootstrap-f43fa23ae0bacee23c19a65e39b96b3a21b9adf1.zip
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'js')
-rw-r--r--js/tests/unit/dropdown.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js
index e45bd0a46..02256965d 100644
--- a/js/tests/unit/dropdown.js
+++ b/js/tests/unit/dropdown.js
@@ -165,9 +165,9 @@ $(function () {
.appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]')
.dropdown()
-
+
stop()
-
+
dropdown
.parent('.dropdown')
.bind('show.bs.dropdown', function () {
@@ -177,7 +177,7 @@ $(function () {
ok(true, 'hide was called')
start()
})
-
+
dropdown.click()
$(document.body).click()
})
@@ -199,9 +199,9 @@ $(function () {
.appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]')
.dropdown()
-
+
stop()
-
+
dropdown
.parent('.dropdown')
.bind('shown.bs.dropdown', function () {
@@ -211,7 +211,7 @@ $(function () {
ok(true, 'hide was called')
start()
})
-
+
dropdown.click()
$(document.body).click()
})