aboutsummaryrefslogtreecommitdiff
path: root/js/tests/unit
diff options
context:
space:
mode:
authorfat <[email protected]>2013-08-02 15:10:47 -0700
committerfat <[email protected]>2013-08-02 15:10:47 -0700
commite969d2ff18214c8d3b2730155d933c0acd614344 (patch)
treeb529f68e63c0b6e98003ec9f9d5d771de500011b /js/tests/unit
parent69f99201327662ec1bd0e15516a064e6dcc9236c (diff)
parent173dac4e54281312ebb7ff993df20caffbc56840 (diff)
downloadbootstrap-e969d2ff18214c8d3b2730155d933c0acd614344.tar.xz
bootstrap-e969d2ff18214c8d3b2730155d933c0acd614344.zip
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Diffstat (limited to 'js/tests/unit')
-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()
})