aboutsummaryrefslogtreecommitdiff
path: root/js/tests
diff options
context:
space:
mode:
authorfat <[email protected]>2013-05-16 20:19:51 -0700
committerfat <[email protected]>2013-05-16 20:19:51 -0700
commit140ef2320bbb96ad90b73a884d83198706affaf9 (patch)
tree4de562f3c4fa8d989de16ebe61fd07732109a9e5 /js/tests
parent5ab72f76878a85f105702a24096268fea73fba2d (diff)
downloadbootstrap-140ef2320bbb96ad90b73a884d83198706affaf9.tar.xz
bootstrap-140ef2320bbb96ad90b73a884d83198706affaf9.zip
change namespace back to dot notation and someother js shizzle
Diffstat (limited to 'js/tests')
-rw-r--r--js/tests/index.html1
-rw-r--r--js/tests/unit/affix.js2
-rw-r--r--js/tests/unit/alert.js6
-rw-r--r--js/tests/unit/button.js2
-rw-r--r--js/tests/unit/carousel.js14
-rw-r--r--js/tests/unit/collapse.js12
-rw-r--r--js/tests/unit/dropdown.js7
-rw-r--r--js/tests/unit/modal.js26
-rw-r--r--js/tests/unit/popover.js4
-rw-r--r--js/tests/unit/tab.js6
-rw-r--r--js/tests/unit/tooltip.js26
11 files changed, 54 insertions, 52 deletions
diff --git a/js/tests/index.html b/js/tests/index.html
index 322a8efd3..0cfadc598 100644
--- a/js/tests/index.html
+++ b/js/tests/index.html
@@ -41,6 +41,7 @@
<script src="unit/tooltip.js"></script>
<script src="unit/popover.js"></script>
<script src="unit/affix.js"></script>
+
</head>
<body>
<div>
diff --git a/js/tests/unit/affix.js b/js/tests/unit/affix.js
index 9829b05ad..b74bc51e4 100644
--- a/js/tests/unit/affix.js
+++ b/js/tests/unit/affix.js
@@ -18,7 +18,7 @@ $(function () {
test("should exit early if element is not visible", function () {
var $affix = $('<div style="display: none"></div>').affix()
- $affix.data('bs-affix').checkPosition()
+ $affix.data('bs.affix').checkPosition()
ok(!$affix.hasClass('affix'), 'affix class was not added')
})
diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js
index 3054767f6..98b10059e 100644
--- a/js/tests/unit/alert.js
+++ b/js/tests/unit/alert.js
@@ -1,6 +1,6 @@
$(function () {
- module("alerts")
+ module("alert")
test("should provide no conflict", function () {
var alert = $.fn.alert.noConflict()
@@ -48,12 +48,12 @@ $(function () {
$.support.transition = false
stop();
$('<div class="alert"/>')
- .bind('bs:alert:close', function (e) {
+ .on('close.bs.alert', function (e) {
e.preventDefault();
ok(true);
start();
})
- .bind('bs:alert:closed', function () {
+ .on('closed.bs.alert', function () {
ok(false);
})
.alert('close')
diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index aaf480c32..943d36d1b 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -1,6 +1,6 @@
$(function () {
- module("buttons")
+ module("button")
test("should provide no conflict", function () {
var button = $.fn.button.noConflict()
diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js
index 4d0bd6e81..f4acda02a 100644
--- a/js/tests/unit/carousel.js
+++ b/js/tests/unit/carousel.js
@@ -20,12 +20,12 @@ $(function () {
$.support.transition = false
stop()
$('<div class="carousel"/>')
- .bind('bs:carousel:slide', function (e) {
+ .on('slide.bs.carousel', function (e) {
e.preventDefault();
ok(true);
start();
})
- .bind('bs:carousel:slid', function () {
+ .on('slid.bs.carousel', function () {
ok(false);
})
.carousel('next')
@@ -35,7 +35,7 @@ $(function () {
var template = '<div id="myCarousel" class="carousel slide"><div class="carousel-inner"><div class="item active"><img alt=""><div class="carousel-caption"><h4>{{_i}}First Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div><div class="item"><img alt=""><div class="carousel-caption"><h4>{{_i}}Second Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div><div class="item"><img alt=""><div class="carousel-caption"><h4>{{_i}}Third Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div></div><a class="left carousel-control" href="#myCarousel" data-slide="prev">&lsaquo;</a><a class="right carousel-control" href="#myCarousel" data-slide="next">&rsaquo;</a></div>'
$.support.transition = false
stop()
- $(template).on('bs:carousel:slide', function (e) {
+ $(template).on('slide.bs.carousel', function (e) {
e.preventDefault()
ok(e.direction)
ok(e.direction === 'right' || e.direction === 'left')
@@ -48,7 +48,7 @@ $(function () {
$.support.transition = false
stop()
$(template)
- .on('bs:carousel:slide', function (e) {
+ .on('slide.bs.carousel', function (e) {
e.preventDefault();
ok(e.relatedTarget);
ok($(e.relatedTarget).hasClass('item'));
@@ -63,19 +63,19 @@ $(function () {
template.appendTo("body");
$('[data-slide]').first().click();
- ok($('#myCarousel').data('bs-carousel').options.interval == 1814);
+ ok($('#myCarousel').data('bs.carousel').options.interval == 1814);
$('#myCarousel').remove();
template.appendTo("body").attr("data-modal", "foobar");
$('[data-slide]').first().click();
- ok($('#myCarousel').data('bs-carousel').options.interval == 1814, "even if there is an data-modal attribute set");
+ ok($('#myCarousel').data('bs.carousel').options.interval == 1814, "even if there is an data-modal attribute set");
$('#myCarousel').remove();
template.appendTo("body");
$('[data-slide]').first().click();
$('#myCarousel').attr('data-interval', 1860);
$('[data-slide]').first().click();
- ok($('#myCarousel').data('bs-carousel').options.interval == 1814, "attributes should be read only on intitialization");
+ ok($('#myCarousel').data('bs.carousel').options.interval == 1814, "attributes should be read only on intitialization");
$('#myCarousel').remove();
})
})
diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js
index 832d6d45d..dd2cee27d 100644
--- a/js/tests/unit/collapse.js
+++ b/js/tests/unit/collapse.js
@@ -32,12 +32,12 @@ $(function () {
$.support.transition = false
stop()
$('<div class="collapse"/>')
- .bind('bs:collapse:show', function (e) {
+ .on('show.bs.collapse', function (e) {
e.preventDefault();
ok(true);
start();
})
- .bind('bs:collapse:shown', function () {
+ .on('shown.bs.collapse', function () {
ok(false);
})
.collapse('show')
@@ -47,10 +47,10 @@ $(function () {
$.support.transition = false
stop()
$('<div class="collapse" style="height: 0px"/>')
- .bind('bs:collapse:show', function () {
+ .on('show.bs.collapse', function () {
ok(this.style.height == '0px')
})
- .bind('bs:collapse:shown', function () {
+ .on('shown.bs.collapse', function () {
ok(this.style.height == 'auto')
start()
})
@@ -66,7 +66,7 @@ $(function () {
var collapsible = $('<div id="test1"></div>')
.appendTo($('#qunit-fixture'))
- .on('bs:collapse:show', function () {
+ .on('show.bs.collapse', function () {
ok(!target.hasClass('collapsed'))
start()
})
@@ -83,7 +83,7 @@ $(function () {
var collapsible = $('<div id="test1" class="in"></div>')
.appendTo($('#qunit-fixture'))
- .on('bs:collapse:hide', function () {
+ .on('hide.bs.collapse', function () {
ok(target.hasClass('collapsed'))
start()
})
diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js
index 6b66c0974..09b5673a4 100644
--- a/js/tests/unit/dropdown.js
+++ b/js/tests/unit/dropdown.js
@@ -103,8 +103,9 @@ $(function () {
.find('[data-toggle="dropdown"]')
.dropdown()
.click()
+
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
- $('.dropdown-backdrop').click()
+ $('body').click()
ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class removed')
dropdown.remove()
})
@@ -136,13 +137,13 @@ $(function () {
first.click()
ok(first.parents('.open').length == 1, 'open class added on click')
ok($('#qunit-fixture .open').length == 1, 'only one object is open')
- $('.dropdown-backdrop').click()
+ $('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')
- $('.dropdown-backdrop').click()
+ $('body').click()
ok($("#qunit-fixture .open").length === 0, 'open class removed')
$("#qunit-fixture").html("")
diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js
index 7d684f3ae..7ee47be38 100644
--- a/js/tests/unit/modal.js
+++ b/js/tests/unit/modal.js
@@ -27,7 +27,7 @@ $(function () {
stop()
$.support.transition = false
$("<div id='modal-test'></div>")
- .bind("bs:modal:shown", function () {
+ .on("shown.bs.modal", function () {
ok($('#modal-test').length, 'modal insterted into dom')
$(this).remove()
start()
@@ -39,10 +39,10 @@ $(function () {
stop()
$.support.transition = false
$("<div id='modal-test'></div>")
- .bind("bs:modal:show", function () {
+ .on("show.bs.modal", function () {
ok(true, "show was called")
})
- .bind("bs:modal:shown", function () {
+ .on("shown.bs.modal", function () {
$(this).remove()
start()
})
@@ -53,12 +53,12 @@ $(function () {
stop()
$.support.transition = false
$("<div id='modal-test'></div>")
- .bind("bs:modal:show", function (e) {
+ .on("show.bs.modal", function (e) {
e.preventDefault()
ok(true, "show was called")
start()
})
- .bind("bs:modal:shown", function () {
+ .on("shown.bs.modal", function () {
ok(false, "shown was called")
})
.modal("show")
@@ -69,12 +69,12 @@ $(function () {
$.support.transition = false
$("<div id='modal-test'></div>")
- .bind("bs:modal:shown", function () {
+ .on("shown.bs.modal", function () {
ok($('#modal-test').is(":visible"), 'modal visible')
ok($('#modal-test').length, 'modal insterted into dom')
$(this).modal("hide")
})
- .bind("bs:modal:hidden", function() {
+ .on("hidden.bs.modal", function() {
ok(!$('#modal-test').is(":visible"), 'modal hidden')
$('#modal-test').remove()
start()
@@ -87,12 +87,12 @@ $(function () {
$.support.transition = false
var div = $("<div id='modal-test'></div>")
div
- .bind("bs:modal:shown", function () {
+ .on("shown.bs.modal", function () {
ok($('#modal-test').is(":visible"), 'modal visible')
ok($('#modal-test').length, 'modal insterted into dom')
div.modal("toggle")
})
- .bind("bs:modal:hidden", function() {
+ .on("hidden.bs.modal", function() {
ok(!$('#modal-test').is(":visible"), 'modal hidden')
div.remove()
start()
@@ -105,12 +105,12 @@ $(function () {
$.support.transition = false
var div = $("<div id='modal-test'><span class='close' data-dismiss='modal'></span></div>")
div
- .bind("bs:modal:shown", function () {
+ .on("shown.bs.modal", function () {
ok($('#modal-test').is(":visible"), 'modal visible')
ok($('#modal-test').length, 'modal insterted into dom')
div.find('.close').click()
})
- .bind("bs:modal:hidden", function() {
+ .on("hidden.bs.modal", function() {
ok(!$('#modal-test').is(":visible"), 'modal hidden')
div.remove()
start()
@@ -123,11 +123,11 @@ $(function () {
$.support.transition = false
var div = $("<div>", { id: 'modal-test', "data-backdrop": false })
div
- .bind("bs:modal:shown", function () {
+ .on("shown.bs.modal", function () {
ok($('#modal-test').is(":visible"), 'modal visible')
div.modal("hide")
})
- .bind("bs:modal:hidden", function() {
+ .on("hidden.bs.modal", function() {
ok(!$('#modal-test').is(":visible"), 'modal hidden')
div.remove()
start()
diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js
index 53980e722..fb0017567 100644
--- a/js/tests/unit/popover.js
+++ b/js/tests/unit/popover.js
@@ -34,7 +34,7 @@ $(function () {
var popover = $('<a href="#" title="mdo" data-content="http://twitter.com/mdo">@mdo</a>')
.popover()
- ok(!!popover.data('bs-popover'), 'popover instance exists')
+ ok(!!popover.data('bs.popover'), 'popover instance exists')
})
test("should get title and content from options", function () {
@@ -99,7 +99,7 @@ $(function () {
test("should destroy popover", function () {
var popover = $('<div/>').popover({trigger: 'hover'}).on('click.foo', function(){})
- ok(popover.data('bs-popover'), 'popover has data')
+ ok(popover.data('bs.popover'), 'popover has data')
ok($._data(popover[0], 'events').mouseover && $._data(popover[0], 'events').mouseout, 'popover has hover event')
ok($._data(popover[0], 'events').click[0].namespace == 'foo', 'popover has extra click.foo event')
popover.popover('show')
diff --git a/js/tests/unit/tab.js b/js/tests/unit/tab.js
index 40e4656a7..aede32abb 100644
--- a/js/tests/unit/tab.js
+++ b/js/tests/unit/tab.js
@@ -53,12 +53,12 @@ $(function () {
$.support.transition = false
stop();
$('<div class="tab"/>')
- .bind('bs:tab:show', function (e) {
+ .on('show.bs.tab', function (e) {
e.preventDefault();
ok(true);
start();
})
- .bind('bs:tab:shown', function () {
+ .on('shown.bs.tab', function () {
ok(false);
})
.tab('show')
@@ -78,7 +78,7 @@ $(function () {
$(dropHTML).find('ul>li:first a').tab('show').end()
.find('ul>li:last a').on('show', function(event){
equals(event.relatedTarget.hash, "#1-1")
- }).on('bs:tab:shown', function(event){
+ }).on('shown', function(event){
equals(event.relatedTarget.hash, "#1-1")
}).tab('show')
})
diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js
index 8a1be0eca..638edefc2 100644
--- a/js/tests/unit/tooltip.js
+++ b/js/tests/unit/tooltip.js
@@ -69,7 +69,7 @@ $(function () {
test("should fire show event", function () {
stop()
var tooltip = $('<div title="tooltip title"></div>')
- .bind("bs:tooltip:show", function() {
+ .on("show.bs.tooltip", function() {
ok(true, "show was called")
start()
})
@@ -79,7 +79,7 @@ $(function () {
test("should fire shown event", function () {
stop()
var tooltip = $('<div title="tooltip title"></div>')
- .bind("bs:tooltip:shown", function() {
+ .on("shown.bs.tooltip", function() {
ok(true, "shown was called")
start()
})
@@ -89,12 +89,12 @@ $(function () {
test("should not fire shown event when default prevented", function () {
stop()
var tooltip = $('<div title="tooltip title"></div>')
- .bind("bs:tooltip:show", function(e) {
+ .on("show.bs.tooltip", function(e) {
e.preventDefault()
ok(true, "show was called")
start()
})
- .bind("bs:tooltip:shown", function() {
+ .on("shown.bs.tooltip", function() {
ok(false, "shown was called")
})
.tooltip('show')
@@ -103,10 +103,10 @@ $(function () {
test("should fire hide event", function () {
stop()
var tooltip = $('<div title="tooltip title"></div>')
- .bind("bs:tooltip:shown", function() {
+ .on("shown.bs.tooltip", function() {
$(this).tooltip('hide')
})
- .bind("bs:tooltip:hide", function() {
+ .on("hide.bs.tooltip", function() {
ok(true, "hide was called")
start()
})
@@ -116,10 +116,10 @@ $(function () {
test("should fire hidden event", function () {
stop()
var tooltip = $('<div title="tooltip title"></div>')
- .bind("bs:tooltip:shown", function() {
+ .on("shown.bs.tooltip", function() {
$(this).tooltip('hide')
})
- .bind("bs:tooltip:hidden", function() {
+ .on("hidden.bs.tooltip", function() {
ok(true, "hidden was called")
start()
})
@@ -129,15 +129,15 @@ $(function () {
test("should not fire hidden event when default prevented", function () {
stop()
var tooltip = $('<div title="tooltip title"></div>')
- .bind("bs:tooltip:shown", function() {
+ .on("shown.bs.tooltip", function() {
$(this).tooltip('hide')
})
- .bind("bs:tooltip:hide", function(e) {
+ .on("hide.bs.tooltip", function(e) {
e.preventDefault()
ok(true, "hide was called")
start()
})
- .bind("bs:tooltip:hidden", function() {
+ .on("hidden.bs.tooltip", function() {
ok(false, "hidden was called")
})
.tooltip('show')
@@ -214,13 +214,13 @@ $(function () {
test("should destroy tooltip", function () {
var tooltip = $('<div/>').tooltip().on('click.foo', function(){})
- ok(tooltip.data('bs-tooltip'), 'tooltip has data')
+ ok(tooltip.data('bs.tooltip'), 'tooltip has data')
ok($._data(tooltip[0], 'events').mouseover && $._data(tooltip[0], 'events').mouseout, 'tooltip has hover event')
ok($._data(tooltip[0], 'events').click[0].namespace == 'foo', 'tooltip has extra click.foo event')
tooltip.tooltip('show')
tooltip.tooltip('destroy')
ok(!tooltip.hasClass('in'), 'tooltip is hidden')
- ok(!$._data(tooltip[0], 'bs-tooltip'), 'tooltip does not have data')
+ ok(!$._data(tooltip[0], 'bs.tooltip'), 'tooltip does not have data')
ok($._data(tooltip[0], 'events').click[0].namespace == 'foo', 'tooltip still has click.foo')
ok(!$._data(tooltip[0], 'events').mouseover && !$._data(tooltip[0], 'events').mouseout, 'tooltip does not have any events')
})
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-11 13:31:58 +0000