aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-04-03 18:13:16 -0700
committerChris Rebert <[email protected]>2014-04-03 18:13:16 -0700
commit5ef634dab9bb39b9dc5beb10a568a05952a519ff (patch)
treef22d9217f6c1ad38c9e44bd5d3dba8a36c479f69
parentf6d1a733f58f76864a137fa1d26db358dc2e9460 (diff)
downloadbootstrap-5ef634dab9bb39b9dc5beb10a568a05952a519ff.tar.xz
bootstrap-5ef634dab9bb39b9dc5beb10a568a05952a519ff.zip
replace $.bind() with $.on() in unit tests; per #13272
-rw-r--r--js/tests/unit/dropdown.js8
-rw-r--r--js/tests/unit/modal.js10
2 files changed, 9 insertions, 9 deletions
diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js
index 8597426cd..2d2e7c51d 100644
--- a/js/tests/unit/dropdown.js
+++ b/js/tests/unit/dropdown.js
@@ -169,10 +169,10 @@ $(function () {
dropdown
.parent('.dropdown')
- .bind('show.bs.dropdown', function () {
+ .on('show.bs.dropdown', function () {
ok(true, 'show was called')
})
- .bind('hide.bs.dropdown', function () {
+ .on('hide.bs.dropdown', function () {
ok(true, 'hide was called')
start()
})
@@ -203,10 +203,10 @@ $(function () {
dropdown
.parent('.dropdown')
- .bind('shown.bs.dropdown', function () {
+ .on('shown.bs.dropdown', function () {
ok(true, 'show was called')
})
- .bind('hidden.bs.dropdown', function () {
+ .on('hidden.bs.dropdown', function () {
ok(true, 'hide was called')
start()
})
diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js
index b026d18c4..34912c2e9 100644
--- a/js/tests/unit/modal.js
+++ b/js/tests/unit/modal.js
@@ -140,13 +140,13 @@ $(function () {
$.support.transition = false
var div = $('<div id="modal-test"><div class="contents"></div></div>')
div
- .bind('shown.bs.modal', function () {
+ .on('shown.bs.modal', function () {
ok($('#modal-test').length, 'modal insterted into dom')
$('.contents').click()
ok($('#modal-test').is(':visible'), 'modal visible')
$('#modal-test').click()
})
- .bind('hidden.bs.modal', function () {
+ .on('hidden.bs.modal', function () {
ok(!$('#modal-test').is(':visible'), 'modal hidden')
div.remove()
start()
@@ -162,11 +162,11 @@ $(function () {
var div = $('<div id="modal-test"><div class="contents"></div></div>')
div
- .bind('shown.bs.modal', function () {
+ .on('shown.bs.modal', function () {
triggered = 0
$('#modal-test').click()
})
- .bind('hide.bs.modal', function () {
+ .on('hide.bs.modal', function () {
triggered += 1
ok(triggered === 1, 'modal hide triggered once')
start()
@@ -179,7 +179,7 @@ $(function () {
$.support.transition = false
var div = $('<div id="modal-test"><div class="contents"><div id="close" data-dismiss="modal"></div></div></div>')
div
- .bind('shown.bs.modal', function () {
+ .on('shown.bs.modal', function () {
$('#close').click()
ok(!$('#modal-test').is(':visible'), 'modal hidden')
})