From 88fdd4542749275d6ab970ee040f2efe10018d5b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 13 Feb 2014 01:12:26 -0800 Subject: v3.1.1 bump --- js/affix.js | 2 +- js/alert.js | 2 +- js/button.js | 2 +- js/carousel.js | 2 +- js/collapse.js | 2 +- js/dropdown.js | 2 +- js/modal.js | 2 +- js/popover.js | 2 +- js/scrollspy.js | 2 +- js/tab.js | 2 +- js/tooltip.js | 2 +- js/transition.js | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) (limited to 'js') diff --git a/js/affix.js b/js/affix.js index d447b0947..05c909e16 100644 --- a/js/affix.js +++ b/js/affix.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: affix.js v3.1.0 + * Bootstrap: affix.js v3.1.1 * http://getbootstrap.com/javascript/#affix * ======================================================================== * Copyright 2011-2014 Twitter, Inc. diff --git a/js/alert.js b/js/alert.js index 1c0756a95..516fe4ff5 100644 --- a/js/alert.js +++ b/js/alert.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: alert.js v3.1.0 + * Bootstrap: alert.js v3.1.1 * http://getbootstrap.com/javascript/#alerts * ======================================================================== * Copyright 2011-2014 Twitter, Inc. diff --git a/js/button.js b/js/button.js index 2be72d53d..f4d8d8b30 100644 --- a/js/button.js +++ b/js/button.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: button.js v3.1.0 + * Bootstrap: button.js v3.1.1 * http://getbootstrap.com/javascript/#buttons * ======================================================================== * Copyright 2011-2014 Twitter, Inc. diff --git a/js/carousel.js b/js/carousel.js index 88c9b23da..19e9af1ed 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: carousel.js v3.1.0 + * Bootstrap: carousel.js v3.1.1 * http://getbootstrap.com/javascript/#carousel * ======================================================================== * Copyright 2011-2014 Twitter, Inc. diff --git a/js/collapse.js b/js/collapse.js index 1abafd6a5..7130282b0 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: collapse.js v3.1.0 + * Bootstrap: collapse.js v3.1.1 * http://getbootstrap.com/javascript/#collapse * ======================================================================== * Copyright 2011-2014 Twitter, Inc. diff --git a/js/dropdown.js b/js/dropdown.js index 9c13aac97..43d7ae3ea 100644 --- a/js/dropdown.js +++ b/js/dropdown.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: dropdown.js v3.1.0 + * Bootstrap: dropdown.js v3.1.1 * http://getbootstrap.com/javascript/#dropdowns * ======================================================================== * Copyright 2011-2014 Twitter, Inc. diff --git a/js/modal.js b/js/modal.js index 24506ea28..20ff27046 100644 --- a/js/modal.js +++ b/js/modal.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: modal.js v3.1.0 + * Bootstrap: modal.js v3.1.1 * http://getbootstrap.com/javascript/#modals * ======================================================================== * Copyright 2011-2014 Twitter, Inc. diff --git a/js/popover.js b/js/popover.js index 193cf06f4..23aa82987 100644 --- a/js/popover.js +++ b/js/popover.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: popover.js v3.1.0 + * Bootstrap: popover.js v3.1.1 * http://getbootstrap.com/javascript/#popovers * ======================================================================== * Copyright 2011-2014 Twitter, Inc. diff --git a/js/scrollspy.js b/js/scrollspy.js index 04958a585..4346c865c 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: scrollspy.js v3.1.0 + * Bootstrap: scrollspy.js v3.1.1 * http://getbootstrap.com/javascript/#scrollspy * ======================================================================== * Copyright 2011-2014 Twitter, Inc. diff --git a/js/tab.js b/js/tab.js index 6f0fd4557..400cb7b84 100644 --- a/js/tab.js +++ b/js/tab.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tab.js v3.1.0 + * Bootstrap: tab.js v3.1.1 * http://getbootstrap.com/javascript/#tabs * ======================================================================== * Copyright 2011-2014 Twitter, Inc. diff --git a/js/tooltip.js b/js/tooltip.js index 6cf2b0f8e..f6c0a376c 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: tooltip.js v3.1.0 + * Bootstrap: tooltip.js v3.1.1 * http://getbootstrap.com/javascript/#tooltip * Inspired by the original jQuery.tipsy by Jason Frame * ======================================================================== diff --git a/js/transition.js b/js/transition.js index 0bcbdcd43..efa8c1716 100644 --- a/js/transition.js +++ b/js/transition.js @@ -1,5 +1,5 @@ /* ======================================================================== - * Bootstrap: transition.js v3.1.0 + * Bootstrap: transition.js v3.1.1 * http://getbootstrap.com/javascript/#transitions * ======================================================================== * Copyright 2011-2014 Twitter, Inc. -- cgit v1.2.3 From 895b0006b9adbaf3c56953d2ab2967aa85071086 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 13 Feb 2014 09:55:12 +0200 Subject: Re-indent test files. --- js/.jshintrc | 1 + js/tests/unit/affix.js | 90 ++--- js/tests/unit/alert.js | 112 +++--- js/tests/unit/button.js | 236 ++++++------- js/tests/unit/carousel.js | 184 +++++----- js/tests/unit/collapse.js | 250 +++++++------- js/tests/unit/dropdown.js | 416 +++++++++++----------- js/tests/unit/modal.js | 378 ++++++++++---------- js/tests/unit/popover.js | 248 +++++++------- js/tests/unit/scrollspy.js | 54 +-- js/tests/unit/tab.js | 134 ++++---- js/tests/unit/tooltip.js | 838 ++++++++++++++++++++++----------------------- 12 files changed, 1471 insertions(+), 1470 deletions(-) (limited to 'js') diff --git a/js/.jshintrc b/js/.jshintrc index ab4dfdfc9..ec4925964 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -8,6 +8,7 @@ "eqeqeq" : false, "eqnull" : true, "expr" : true, + "indent" : 2, "laxbreak" : true, "quotmark" : "single", "validthis": true diff --git a/js/tests/unit/affix.js b/js/tests/unit/affix.js index 3c8105bce..b348ecf2b 100644 --- a/js/tests/unit/affix.js +++ b/js/tests/unit/affix.js @@ -1,50 +1,50 @@ $(function () { - module('affix') - - test('should provide no conflict', function () { - var affix = $.fn.affix.noConflict() - ok(!$.fn.affix, 'affix was set back to undefined (org value)') - $.fn.affix = affix - }) - - test('should be defined on jquery object', function () { - ok($(document.body).affix, 'affix method is defined') - }) - - test('should return element', function () { - ok($(document.body).affix()[0] == document.body, 'document.body returned') - }) - - test('should exit early if element is not visible', function () { - var $affix = $('
').affix() - $affix.data('bs.affix').checkPosition() - ok(!$affix.hasClass('affix'), 'affix class was not added') + module('affix') + + test('should provide no conflict', function () { + var affix = $.fn.affix.noConflict() + ok(!$.fn.affix, 'affix was set back to undefined (org value)') + $.fn.affix = affix + }) + + test('should be defined on jquery object', function () { + ok($(document.body).affix, 'affix method is defined') + }) + + test('should return element', function () { + ok($(document.body).affix()[0] == document.body, 'document.body returned') + }) + + test('should exit early if element is not visible', function () { + var $affix = $('
').affix() + $affix.data('bs.affix').checkPosition() + ok(!$affix.hasClass('affix'), 'affix class was not added') + }) + + test('should trigger affixed event after affix', function () { + stop() + + var template = $('
  • Please affix
  • And unaffix
') + template.appendTo('body') + + var affixer = $('#affixTarget').affix({ + offset: $('#affixTarget ul').position() + }) + + $('#affixTarget') + .on('affix.bs.affix', function (e) { + ok(true, 'affix event triggered') + }).on('affixed.bs.affix', function (e) { + ok(true,'affixed event triggered') + $('#affixTarget').remove() + $('#affixAfter').remove() + start() }) - test('should trigger affixed event after affix', function () { - stop() - - var template = $('
  • Please affix
  • And unaffix
') - template.appendTo('body') - - var affixer = $('#affixTarget').affix({ - offset: $('#affixTarget ul').position() - }) - - $('#affixTarget') - .on('affix.bs.affix', function (e) { - ok(true, 'affix event triggered') - }).on('affixed.bs.affix', function (e) { - ok(true,'affixed event triggered') - $('#affixTarget').remove() - $('#affixAfter').remove() - start() - }) - - setTimeout(function () { - window.scrollTo(0, document.body.scrollHeight) - setTimeout(function () { window.scroll(0,0) }, 0) - },0) - }) + setTimeout(function () { + window.scrollTo(0, document.body.scrollHeight) + setTimeout(function () { window.scroll(0,0) }, 0) + },0) + }) }) diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js index b88b95fee..755d9d1e5 100644 --- a/js/tests/unit/alert.js +++ b/js/tests/unit/alert.js @@ -1,62 +1,62 @@ $(function () { - module('alert') - - test('should provide no conflict', function () { - var alert = $.fn.alert.noConflict() - ok(!$.fn.alert, 'alert was set back to undefined (org value)') - $.fn.alert = alert - }) - - test('should be defined on jquery object', function () { - ok($(document.body).alert, 'alert method is defined') - }) - - test('should return element', function () { - ok($(document.body).alert()[0] == document.body, 'document.body returned') - }) - - test('should fade element out on clicking .close', function () { - var alertHTML = '
' + - '×' + - '

Holy guacamole! Best check yo self, you\'re not looking too good.

' + - '
', - alert = $(alertHTML).alert() - - alert.find('.close').click() - - ok(!alert.hasClass('in'), 'remove .in class on .close click') - }) - - test('should remove element when clicking .close', function () { - $.support.transition = false - - var alertHTML = '
' + - '×' + - '

Holy guacamole! Best check yo self, you\'re not looking too good.

' + - '
', - alert = $(alertHTML).appendTo('#qunit-fixture').alert() - - ok($('#qunit-fixture').find('.alert-message').length, 'element added to dom') - - alert.find('.close').click() - - ok(!$('#qunit-fixture').find('.alert-message').length, 'element removed from dom') + module('alert') + + test('should provide no conflict', function () { + var alert = $.fn.alert.noConflict() + ok(!$.fn.alert, 'alert was set back to undefined (org value)') + $.fn.alert = alert + }) + + test('should be defined on jquery object', function () { + ok($(document.body).alert, 'alert method is defined') + }) + + test('should return element', function () { + ok($(document.body).alert()[0] == document.body, 'document.body returned') + }) + + test('should fade element out on clicking .close', function () { + var alertHTML = '
' + + '×' + + '

Holy guacamole! Best check yo self, you\'re not looking too good.

' + + '
', + alert = $(alertHTML).alert() + + alert.find('.close').click() + + ok(!alert.hasClass('in'), 'remove .in class on .close click') + }) + + test('should remove element when clicking .close', function () { + $.support.transition = false + + var alertHTML = '
' + + '×' + + '

Holy guacamole! Best check yo self, you\'re not looking too good.

' + + '
', + alert = $(alertHTML).appendTo('#qunit-fixture').alert() + + ok($('#qunit-fixture').find('.alert-message').length, 'element added to dom') + + alert.find('.close').click() + + ok(!$('#qunit-fixture').find('.alert-message').length, 'element removed from dom') + }) + + test('should not fire closed when close is prevented', function () { + $.support.transition = false + stop(); + $('
') + .on('close.bs.alert', function (e) { + e.preventDefault(); + ok(true); + start(); }) - - test('should not fire closed when close is prevented', function () { - $.support.transition = false - stop(); - $('
') - .on('close.bs.alert', function (e) { - e.preventDefault(); - ok(true); - start(); - }) - .on('closed.bs.alert', function () { - ok(false); - }) - .alert('close') + .on('closed.bs.alert', function () { + ok(false); }) + .alert('close') + }) }) diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js index 104e8d857..73420863c 100644 --- a/js/tests/unit/button.js +++ b/js/tests/unit/button.js @@ -1,122 +1,122 @@ $(function () { - module('button') - - test('should provide no conflict', function () { - var button = $.fn.button.noConflict() - ok(!$.fn.button, 'button was set back to undefined (org value)') - $.fn.button = button - }) - - test('should be defined on jquery object', function () { - ok($(document.body).button, 'button method is defined') - }) - - test('should return element', function () { - ok($(document.body).button()[0] == document.body, 'document.body returned') - }) - - test('should return set state to loading', function () { - var btn = $('') - equal(btn.html(), 'mdo', 'btn text equals mdo') - btn.button('loading') - equal(btn.html(), 'fat', 'btn text equals fat') - stop() - setTimeout(function () { - ok(btn.attr('disabled'), 'btn is disabled') - ok(btn.hasClass('disabled'), 'btn has disabled class') - start() - }, 0) - }) - - test('should return reset state', function () { - var btn = $('') - equal(btn.html(), 'mdo', 'btn text equals mdo') - btn.button('loading') - equal(btn.html(), 'fat', 'btn text equals fat') - stop() - setTimeout(function () { - ok(btn.attr('disabled'), 'btn is disabled') - ok(btn.hasClass('disabled'), 'btn has disabled class') - start() - stop() - btn.button('reset') - equal(btn.html(), 'mdo', 'btn text equals mdo') - setTimeout(function () { - ok(!btn.attr('disabled'), 'btn is not disabled') - ok(!btn.hasClass('disabled'), 'btn does not have disabled class') - start() - }, 0) - }, 0) - - }) - - test('should toggle active', function () { - var btn = $('') - ok(!btn.hasClass('active'), 'btn does not have active class') - btn.button('toggle') - ok(btn.hasClass('active'), 'btn has class active') - }) - - test('should toggle active when btn children are clicked', function () { - var btn = $(''), - inner = $('') - btn - .append(inner) - .appendTo($('#qunit-fixture')) - ok(!btn.hasClass('active'), 'btn does not have active class') - inner.click() - ok(btn.hasClass('active'), 'btn has class active') - }) - - test('should toggle active when btn children are clicked within btn-group', function () { - var btngroup = $('
'), - btn = $(''), - inner = $('') - btngroup - .append(btn.append(inner)) - .appendTo($('#qunit-fixture')) - ok(!btn.hasClass('active'), 'btn does not have active class') - inner.click() - ok(btn.hasClass('active'), 'btn has class active') - }) - - test('should check for closest matching toggle', function () { - var group = '
' + - '' + - '' + - '' + - '
' - - group = $(group) - - var btn1 = $(group.children()[0]) - var btn2 = $(group.children()[1]) - var btn3 = $(group.children()[2]) - - group.appendTo($('#qunit-fixture')) - - ok(btn1.hasClass('active'), 'btn1 has active class') - ok(btn1.find('input').prop('checked'), 'btn1 is checked') - ok(!btn2.hasClass('active'), 'btn2 does not have active class') - ok(!btn2.find('input').prop('checked'), 'btn2 is not checked') - btn2.find('input').click() - ok(!btn1.hasClass('active'), 'btn1 does not have active class') - ok(!btn1.find('input').prop('checked'), 'btn1 is checked') - ok(btn2.hasClass('active'), 'btn2 has active class') - ok(btn2.find('input').prop('checked'), 'btn2 is checked') - - btn2.find('input').click() /* clicking an already checked radio should not un-check it */ - ok(!btn1.hasClass('active'), 'btn1 does not have active class') - ok(!btn1.find('input').prop('checked'), 'btn1 is checked') - ok(btn2.hasClass('active'), 'btn2 has active class') - ok(btn2.find('input').prop('checked'), 'btn2 is checked') - }) + module('button') + + test('should provide no conflict', function () { + var button = $.fn.button.noConflict() + ok(!$.fn.button, 'button was set back to undefined (org value)') + $.fn.button = button + }) + + test('should be defined on jquery object', function () { + ok($(document.body).button, 'button method is defined') + }) + + test('should return element', function () { + ok($(document.body).button()[0] == document.body, 'document.body returned') + }) + + test('should return set state to loading', function () { + var btn = $('') + equal(btn.html(), 'mdo', 'btn text equals mdo') + btn.button('loading') + equal(btn.html(), 'fat', 'btn text equals fat') + stop() + setTimeout(function () { + ok(btn.attr('disabled'), 'btn is disabled') + ok(btn.hasClass('disabled'), 'btn has disabled class') + start() + }, 0) + }) + + test('should return reset state', function () { + var btn = $('') + equal(btn.html(), 'mdo', 'btn text equals mdo') + btn.button('loading') + equal(btn.html(), 'fat', 'btn text equals fat') + stop() + setTimeout(function () { + ok(btn.attr('disabled'), 'btn is disabled') + ok(btn.hasClass('disabled'), 'btn has disabled class') + start() + stop() + btn.button('reset') + equal(btn.html(), 'mdo', 'btn text equals mdo') + setTimeout(function () { + ok(!btn.attr('disabled'), 'btn is not disabled') + ok(!btn.hasClass('disabled'), 'btn does not have disabled class') + start() + }, 0) + }, 0) + + }) + + test('should toggle active', function () { + var btn = $('') + ok(!btn.hasClass('active'), 'btn does not have active class') + btn.button('toggle') + ok(btn.hasClass('active'), 'btn has class active') + }) + + test('should toggle active when btn children are clicked', function () { + var btn = $(''), + inner = $('') + btn + .append(inner) + .appendTo($('#qunit-fixture')) + ok(!btn.hasClass('active'), 'btn does not have active class') + inner.click() + ok(btn.hasClass('active'), 'btn has class active') + }) + + test('should toggle active when btn children are clicked within btn-group', function () { + var btngroup = $('
'), + btn = $(''), + inner = $('') + btngroup + .append(btn.append(inner)) + .appendTo($('#qunit-fixture')) + ok(!btn.hasClass('active'), 'btn does not have active class') + inner.click() + ok(btn.hasClass('active'), 'btn has class active') + }) + + test('should check for closest matching toggle', function () { + var group = '
' + + '' + + '' + + '' + + '
' + + group = $(group) + + var btn1 = $(group.children()[0]) + var btn2 = $(group.children()[1]) + var btn3 = $(group.children()[2]) + + group.appendTo($('#qunit-fixture')) + + ok(btn1.hasClass('active'), 'btn1 has active class') + ok(btn1.find('input').prop('checked'), 'btn1 is checked') + ok(!btn2.hasClass('active'), 'btn2 does not have active class') + ok(!btn2.find('input').prop('checked'), 'btn2 is not checked') + btn2.find('input').click() + ok(!btn1.hasClass('active'), 'btn1 does not have active class') + ok(!btn1.find('input').prop('checked'), 'btn1 is checked') + ok(btn2.hasClass('active'), 'btn2 has active class') + ok(btn2.find('input').prop('checked'), 'btn2 is checked') + + btn2.find('input').click() /* clicking an already checked radio should not un-check it */ + ok(!btn1.hasClass('active'), 'btn1 does not have active class') + ok(!btn1.find('input').prop('checked'), 'btn1 is checked') + ok(btn2.hasClass('active'), 'btn2 has active class') + ok(btn2.find('input').prop('checked'), 'btn2 is checked') + }) }) diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js index 5edec68ad..6851e17a5 100644 --- a/js/tests/unit/carousel.js +++ b/js/tests/unit/carousel.js @@ -1,110 +1,110 @@ $(function () { - module('carousel') + module('carousel') - test('should provide no conflict', function () { - var carousel = $.fn.carousel.noConflict() - ok(!$.fn.carousel, 'carousel was set back to undefined (org value)') - $.fn.carousel = carousel - }) + test('should provide no conflict', function () { + var carousel = $.fn.carousel.noConflict() + ok(!$.fn.carousel, 'carousel was set back to undefined (org value)') + $.fn.carousel = carousel + }) - test('should be defined on jquery object', function () { - ok($(document.body).carousel, 'carousel method is defined') - }) + test('should be defined on jquery object', function () { + ok($(document.body).carousel, 'carousel method is defined') + }) - test('should return element', function () { - ok($(document.body).carousel()[0] == document.body, 'document.body returned') - }) + test('should return element', function () { + ok($(document.body).carousel()[0] == document.body, 'document.body returned') + }) - test('should not fire slide when slide is prevented', function () { - $.support.transition = false - stop() - $('
') - .on('slide.bs.carousel', function (e) { - e.preventDefault(); - ok(true); - start(); - }) - .on('slid.bs.carousel', function () { - ok(false); - }) - .carousel('next') + test('should not fire slide when slide is prevented', function () { + $.support.transition = false + stop() + $('
') + .on('slide.bs.carousel', function (e) { + e.preventDefault(); + ok(true); + start(); + }) + .on('slid.bs.carousel', function () { + ok(false); }) + .carousel('next') + }) - test('should reset when slide is prevented', function () { - var template = '' - var $carousel = $(template) - $.support.transition = false - stop() - $carousel.one('slide.bs.carousel', function (e) { - e.preventDefault() - setTimeout(function () { - ok($carousel.find('.item:eq(0)').is('.active')) - ok($carousel.find('.carousel-indicators li:eq(0)').is('.active')) - $carousel.carousel('next') - }, 1); - }) - $carousel.one('slid.bs.carousel', function () { - setTimeout(function () { - ok($carousel.find('.item:eq(1)').is('.active')) - ok($carousel.find('.carousel-indicators li:eq(1)').is('.active')) - start() - }, 1); - }) + test('should reset when slide is prevented', function () { + var template = '' + var $carousel = $(template) + $.support.transition = false + stop() + $carousel.one('slide.bs.carousel', function (e) { + e.preventDefault() + setTimeout(function () { + ok($carousel.find('.item:eq(0)').is('.active')) + ok($carousel.find('.carousel-indicators li:eq(0)').is('.active')) $carousel.carousel('next') - }) + }, 1); + }) + $carousel.one('slid.bs.carousel', function () { + setTimeout(function () { + ok($carousel.find('.item:eq(1)').is('.active')) + ok($carousel.find('.carousel-indicators li:eq(1)').is('.active')) + start() + }, 1); + }) + $carousel.carousel('next') + }) - test('should fire slide event with direction', function () { - var template = '' - $.support.transition = false - stop() - $(template).on('slide.bs.carousel', function (e) { - e.preventDefault() - ok(e.direction) - ok(e.direction === 'right' || e.direction === 'left') - start() - }).carousel('next') - }) + test('should fire slide event with direction', function () { + var template = '' + $.support.transition = false + stop() + $(template).on('slide.bs.carousel', function (e) { + e.preventDefault() + ok(e.direction) + ok(e.direction === 'right' || e.direction === 'left') + start() + }).carousel('next') + }) - test('should fire slide event with relatedTarget', function () { - var template = '' - $.support.transition = false - stop() - $(template) - .on('slide.bs.carousel', function (e) { - e.preventDefault(); - ok(e.relatedTarget); - ok($(e.relatedTarget).hasClass('item')); - start(); - }) - .carousel('next') + test('should fire slide event with relatedTarget', function () { + var template = '' + $.support.transition = false + stop() + $(template) + .on('slide.bs.carousel', function (e) { + e.preventDefault(); + ok(e.relatedTarget); + ok($(e.relatedTarget).hasClass('item')); + start(); }) + .carousel('next') + }) - test('should set interval from data attribute', 4, function () { - var template = $(''); - template.attr('data-interval', 1814); + test('should set interval from data attribute', 4, function () { + var template = $(''); + template.attr('data-interval', 1814); - template.appendTo('body'); - $('[data-slide]').first().click(); - ok($('#myCarousel').data('bs.carousel').options.interval == 1814); - $('#myCarousel').remove(); + template.appendTo('body'); + $('[data-slide]').first().click(); + 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'); - $('#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'); + $('#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'); - $('#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'); + $('#myCarousel').remove(); - template.attr('data-interval', false); - template.appendTo('body'); - $('#myCarousel').carousel(1); - ok($('#myCarousel').data('bs.carousel').options.interval === false, 'data attribute has higher priority than default options'); - $('#myCarousel').remove(); - }) + template.attr('data-interval', false); + template.appendTo('body'); + $('#myCarousel').carousel(1); + ok($('#myCarousel').data('bs.carousel').options.interval === false, 'data attribute has higher priority than default options'); + $('#myCarousel').remove(); + }) }) diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js index 10d5aeda6..133e6eab7 100644 --- a/js/tests/unit/collapse.js +++ b/js/tests/unit/collapse.js @@ -1,164 +1,164 @@ $(function () { - module('collapse') - - test('should provide no conflict', function () { - var collapse = $.fn.collapse.noConflict() - ok(!$.fn.collapse, 'collapse was set back to undefined (org value)') - $.fn.collapse = collapse - }) - - test('should be defined on jquery object', function () { - ok($(document.body).collapse, 'collapse method is defined') - }) - - test('should return element', function () { - ok($(document.body).collapse()[0] == document.body, 'document.body returned') - }) - - test('should show a collapsed element', function () { - var el = $('
').collapse('show') - ok(el.hasClass('in'), 'has class in') - ok(/height/.test(el.attr('style')), 'has height set') + module('collapse') + + test('should provide no conflict', function () { + var collapse = $.fn.collapse.noConflict() + ok(!$.fn.collapse, 'collapse was set back to undefined (org value)') + $.fn.collapse = collapse + }) + + test('should be defined on jquery object', function () { + ok($(document.body).collapse, 'collapse method is defined') + }) + + test('should return element', function () { + ok($(document.body).collapse()[0] == document.body, 'document.body returned') + }) + + test('should show a collapsed element', function () { + var el = $('
').collapse('show') + ok(el.hasClass('in'), 'has class in') + ok(/height/.test(el.attr('style')), 'has height set') + }) + + test('should hide a collapsed element', function () { + var el = $('
').collapse('hide') + ok(!el.hasClass('in'), 'does not have class in') + ok(/height/.test(el.attr('style')), 'has height set') + }) + + test('should not fire shown when show is prevented', function () { + $.support.transition = false + stop() + $('
') + .on('show.bs.collapse', function (e) { + e.preventDefault(); + ok(true); + start(); }) - - test('should hide a collapsed element', function () { - var el = $('
').collapse('hide') - ok(!el.hasClass('in'), 'does not have class in') - ok(/height/.test(el.attr('style')), 'has height set') + .on('shown.bs.collapse', function () { + ok(false); }) - - test('should not fire shown when show is prevented', function () { - $.support.transition = false - stop() - $('
') - .on('show.bs.collapse', function (e) { - e.preventDefault(); - ok(true); - start(); - }) - .on('shown.bs.collapse', function () { - ok(false); - }) - .collapse('show') + .collapse('show') + }) + + test('should reset style to auto after finishing opening collapse', function () { + $.support.transition = false + stop() + $('
') + .on('show.bs.collapse', function () { + ok(this.style.height == '0px') }) - - test('should reset style to auto after finishing opening collapse', function () { - $.support.transition = false - stop() - $('
') - .on('show.bs.collapse', function () { - ok(this.style.height == '0px') - }) - .on('shown.bs.collapse', function () { - ok(this.style.height == 'auto') - start() - }) - .collapse('show') + .on('shown.bs.collapse', function () { + ok(this.style.height == 'auto') + start() }) + .collapse('show') + }) - test('should add active class to target when collapse shown', function () { - $.support.transition = false - stop() - - var target = $('') - .appendTo($('#qunit-fixture')) + test('should add active class to target when collapse shown', function () { + $.support.transition = false + stop() - var collapsible = $('
') - .appendTo($('#qunit-fixture')) - .on('show.bs.collapse', function () { - ok(!target.hasClass('collapsed')) - start() - }) + var target = $('') + .appendTo($('#qunit-fixture')) - target.click() + var collapsible = $('
') + .appendTo($('#qunit-fixture')) + .on('show.bs.collapse', function () { + ok(!target.hasClass('collapsed')) + start() }) - test('should remove active class to target when collapse hidden', function () { - $.support.transition = false - stop() + target.click() + }) - var target = $('') - .appendTo($('#qunit-fixture')) + test('should remove active class to target when collapse hidden', function () { + $.support.transition = false + stop() - var collapsible = $('
') - .appendTo($('#qunit-fixture')) - .on('hide.bs.collapse', function () { - ok(target.hasClass('collapsed')) - start() - }) + var target = $('') + .appendTo($('#qunit-fixture')) - target.click() + var collapsible = $('
') + .appendTo($('#qunit-fixture')) + .on('hide.bs.collapse', function () { + ok(target.hasClass('collapsed')) + start() }) - test('should remove active class from inactive accordion targets', function () { - $.support.transition = false - stop() + target.click() + }) - var accordion = $('
') - .appendTo($('#qunit-fixture')) + test('should remove active class from inactive accordion targets', function () { + $.support.transition = false + stop() - var target1 = $('') - .appendTo(accordion.find('.accordion-group').eq(0)) + var accordion = $('
') + .appendTo($('#qunit-fixture')) - var collapsible1 = $('
') - .appendTo(accordion.find('.accordion-group').eq(0)) + var target1 = $('') + .appendTo(accordion.find('.accordion-group').eq(0)) - var target2 = $('') - .appendTo(accordion.find('.accordion-group').eq(1)) + var collapsible1 = $('
') + .appendTo(accordion.find('.accordion-group').eq(0)) - var collapsible2 = $('
') - .appendTo(accordion.find('.accordion-group').eq(1)) + var target2 = $('') + .appendTo(accordion.find('.accordion-group').eq(1)) - var target3 = $('') - .appendTo(accordion.find('.accordion-group').eq(2)) + var collapsible2 = $('
') + .appendTo(accordion.find('.accordion-group').eq(1)) - var collapsible3 = $('
') - .appendTo(accordion.find('.accordion-group').eq(2)) - .on('show.bs.collapse', function () { - ok(target1.hasClass('collapsed')) - ok(target2.hasClass('collapsed')) - ok(!target3.hasClass('collapsed')) + var target3 = $('') + .appendTo(accordion.find('.accordion-group').eq(2)) - start() - }) + var collapsible3 = $('
') + .appendTo(accordion.find('.accordion-group').eq(2)) + .on('show.bs.collapse', function () { + ok(target1.hasClass('collapsed')) + ok(target2.hasClass('collapsed')) + ok(!target3.hasClass('collapsed')) - target3.click() + start() }) - test('should allow dots in data-parent', function () { - $.support.transition = false - stop() + target3.click() + }) - var accordion = $('
') - .appendTo($('#qunit-fixture')) + test('should allow dots in data-parent', function () { + $.support.transition = false + stop() - var target1 = $('') - .appendTo(accordion.find('.accordion-group').eq(0)) + var accordion = $('
') + .appendTo($('#qunit-fixture')) - var collapsible1 = $('
') - .appendTo(accordion.find('.accordion-group').eq(0)) + var target1 = $('') + .appendTo(accordion.find('.accordion-group').eq(0)) - var target2 = $('') - .appendTo(accordion.find('.accordion-group').eq(1)) + var collapsible1 = $('
') + .appendTo(accordion.find('.accordion-group').eq(0)) - var collapsible2 = $('
') - .appendTo(accordion.find('.accordion-group').eq(1)) + var target2 = $('') + .appendTo(accordion.find('.accordion-group').eq(1)) - var target3 = $('') - .appendTo(accordion.find('.accordion-group').eq(2)) + var collapsible2 = $('
') + .appendTo(accordion.find('.accordion-group').eq(1)) - var collapsible3 = $('
') - .appendTo(accordion.find('.accordion-group').eq(2)) - .on('show.bs.collapse', function () { - ok(target1.hasClass('collapsed')) - ok(target2.hasClass('collapsed')) - ok(!target3.hasClass('collapsed')) + var target3 = $('') + .appendTo(accordion.find('.accordion-group').eq(2)) - start() - }) + var collapsible3 = $('
') + .appendTo(accordion.find('.accordion-group').eq(2)) + .on('show.bs.collapse', function () { + ok(target1.hasClass('collapsed')) + ok(target2.hasClass('collapsed')) + ok(!target3.hasClass('collapsed')) - target3.click() + start() }) + target3.click() + }) + }) diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js index b358b7387..8597426cd 100644 --- a/js/tests/unit/dropdown.js +++ b/js/tests/unit/dropdown.js @@ -1,218 +1,218 @@ $(function () { - module('dropdowns') - - test('should provide no conflict', function () { - var dropdown = $.fn.dropdown.noConflict() - ok(!$.fn.dropdown, 'dropdown was set back to undefined (org value)') - $.fn.dropdown = dropdown - }) - - test('should be defined on jquery object', function () { - ok($(document.body).dropdown, 'dropdown method is defined') - }) - - test('should return element', function () { - var el = $('
') - ok(el.dropdown()[0] === el[0], 'same element returned') - }) - - test('should not open dropdown if target is disabled', function () { - var dropdownHTML = '', - dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() - - ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') - }) - - test('should not open dropdown if target is disabled', function () { - var dropdownHTML = '', - dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() - - ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') + module('dropdowns') + + test('should provide no conflict', function () { + var dropdown = $.fn.dropdown.noConflict() + ok(!$.fn.dropdown, 'dropdown was set back to undefined (org value)') + $.fn.dropdown = dropdown + }) + + test('should be defined on jquery object', function () { + ok($(document.body).dropdown, 'dropdown method is defined') + }) + + test('should return element', function () { + var el = $('
') + ok(el.dropdown()[0] === el[0], 'same element returned') + }) + + test('should not open dropdown if target is disabled', function () { + var dropdownHTML = '', + dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() + + ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') + }) + + test('should not open dropdown if target is disabled', function () { + var dropdownHTML = '', + dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() + + ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') + }) + + test('should add class open to menu if clicked', function () { + var dropdownHTML = '', + dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() + + ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') + }) + + test('should test if element has a # before assuming it\'s a selector', function () { + var dropdownHTML = '', + dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() + + ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') + }) + + + test('should remove open class if body clicked', function () { + var dropdownHTML = '', + dropdown = $(dropdownHTML) + .appendTo('#qunit-fixture') + .find('[data-toggle="dropdown"]') + .dropdown() + .click() + + ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') + $('body').click() + ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class removed') + dropdown.remove() + }) + + test('should remove open class if body clicked, with multiple drop downs', function () { + var dropdownHTML = '' + + '
' + + ' ' + + ' ' + + ' ' + + '
', + 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('') + }) + + test('should fire show and hide event', function () { + var dropdownHTML = '', + dropdown = $(dropdownHTML) + .appendTo('#qunit-fixture') + .find('[data-toggle="dropdown"]') + .dropdown() + + stop() + + dropdown + .parent('.dropdown') + .bind('show.bs.dropdown', function () { + ok(true, 'show was called') }) - - test('should add class open to menu if clicked', function () { - var dropdownHTML = '', - dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() - - ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') + .bind('hide.bs.dropdown', function () { + ok(true, 'hide was called') + start() }) - test('should test if element has a # before assuming it\'s a selector', function () { - var dropdownHTML = '', - dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click() - - ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') + dropdown.click() + $(document.body).click() + }) + + + test('should fire shown and hiden event', function () { + var dropdownHTML = '', + dropdown = $(dropdownHTML) + .appendTo('#qunit-fixture') + .find('[data-toggle="dropdown"]') + .dropdown() + + stop() + + dropdown + .parent('.dropdown') + .bind('shown.bs.dropdown', function () { + ok(true, 'show was called') }) - - - test('should remove open class if body clicked', function () { - var dropdownHTML = '', - dropdown = $(dropdownHTML) - .appendTo('#qunit-fixture') - .find('[data-toggle="dropdown"]') - .dropdown() - .click() - - ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') - $('body').click() - ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class removed') - dropdown.remove() - }) - - test('should remove open class if body clicked, with multiple drop downs', function () { - var dropdownHTML = '' + - '
' + - ' ' + - ' ' + - ' ' + - '
', - 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('') + .bind('hidden.bs.dropdown', function () { + ok(true, 'hide was called') + start() }) - test('should fire show and hide event', function () { - var dropdownHTML = '', - dropdown = $(dropdownHTML) - .appendTo('#qunit-fixture') - .find('[data-toggle="dropdown"]') - .dropdown() - - stop() - - dropdown - .parent('.dropdown') - .bind('show.bs.dropdown', function () { - ok(true, 'show was called') - }) - .bind('hide.bs.dropdown', function () { - ok(true, 'hide was called') - start() - }) - - dropdown.click() - $(document.body).click() - }) - - - test('should fire shown and hiden event', function () { - var dropdownHTML = '', - dropdown = $(dropdownHTML) - .appendTo('#qunit-fixture') - .find('[data-toggle="dropdown"]') - .dropdown() - - stop() - - dropdown - .parent('.dropdown') - .bind('shown.bs.dropdown', function () { - ok(true, 'show was called') - }) - .bind('hidden.bs.dropdown', function () { - ok(true, 'hide was called') - start() - }) - - dropdown.click() - $(document.body).click() - }) + dropdown.click() + $(document.body).click() + }) }) diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js index 281978142..b026d18c4 100644 --- a/js/tests/unit/modal.js +++ b/js/tests/unit/modal.js @@ -2,194 +2,194 @@ $(function () { module('modal') - test('should provide no conflict', function () { - var modal = $.fn.modal.noConflict() - ok(!$.fn.modal, 'modal was set back to undefined (org value)') - $.fn.modal = modal - }) - - test('should be defined on jquery object', function () { - var div = $('') - ok(div.modal, 'modal method is defined') - }) - - test('should return element', function () { - var div = $('') - ok(div.modal() == div, 'document.body returned') - $('#modal-test').remove() - }) - - test('should expose defaults var for settings', function () { - ok($.fn.modal.Constructor.DEFAULTS, 'default object exposed') - }) - - test('should insert into dom when show method is called', function () { - stop() - $.support.transition = false - $('') - .on('shown.bs.modal', function () { - ok($('#modal-test').length, 'modal inserted into dom') - $(this).remove() + test('should provide no conflict', function () { + var modal = $.fn.modal.noConflict() + ok(!$.fn.modal, 'modal was set back to undefined (org value)') + $.fn.modal = modal + }) + + test('should be defined on jquery object', function () { + var div = $('') + ok(div.modal, 'modal method is defined') + }) + + test('should return element', function () { + var div = $('') + ok(div.modal() == div, 'document.body returned') + $('#modal-test').remove() + }) + + test('should expose defaults var for settings', function () { + ok($.fn.modal.Constructor.DEFAULTS, 'default object exposed') + }) + + test('should insert into dom when show method is called', function () { + stop() + $.support.transition = false + $('') + .on('shown.bs.modal', function () { + ok($('#modal-test').length, 'modal inserted into dom') + $(this).remove() + start() + }) + .modal('show') + }) + + test('should fire show event', function () { + stop() + $.support.transition = false + $('') + .on('show.bs.modal', function () { + ok(true, 'show was called') + }) + .on('shown.bs.modal', function () { + $(this).remove() + start() + }) + .modal('show') + }) + + test('should not fire shown when default prevented', function () { + stop() + $.support.transition = false + $('') + .on('show.bs.modal', function (e) { + e.preventDefault() + ok(true, 'show was called') + start() + }) + .on('shown.bs.modal', function () { + ok(false, 'shown was called') + }) + .modal('show') + }) + + test('should hide modal when hide is called', function () { + stop() + $.support.transition = false + + $('') + .on('shown.bs.modal', function () { + ok($('#modal-test').is(':visible'), 'modal visible') + ok($('#modal-test').length, 'modal inserted into dom') + $(this).modal('hide') + }) + .on('hidden.bs.modal', function () { + ok(!$('#modal-test').is(':visible'), 'modal hidden') + $('#modal-test').remove() + start() + }) + .modal('show') + }) + + test('should toggle when toggle is called', function () { + stop() + $.support.transition = false + var div = $('') + div + .on('shown.bs.modal', function () { + ok($('#modal-test').is(':visible'), 'modal visible') + ok($('#modal-test').length, 'modal inserted into dom') + div.modal('toggle') + }) + .on('hidden.bs.modal', function () { + ok(!$('#modal-test').is(':visible'), 'modal hidden') + div.remove() + start() + }) + .modal('toggle') + }) + + test('should remove from dom when click [data-dismiss=modal]', function () { + stop() + $.support.transition = false + var div = $('') + div + .on('shown.bs.modal', function () { + ok($('#modal-test').is(':visible'), 'modal visible') + ok($('#modal-test').length, 'modal inserted into dom') + div.find('.close').click() + }) + .on('hidden.bs.modal', function () { + ok(!$('#modal-test').is(':visible'), 'modal hidden') + div.remove() + start() + }) + .modal('toggle') + }) + + test('should allow modal close with "backdrop:false"', function () { + stop() + $.support.transition = false + var div = $('
', { id: 'modal-test', 'data-backdrop': false }) + div + .on('shown.bs.modal', function () { + ok($('#modal-test').is(':visible'), 'modal visible') + div.modal('hide') + }) + .on('hidden.bs.modal', function () { + ok(!$('#modal-test').is(':visible'), 'modal hidden') + div.remove() + start() + }) + .modal('show') + }) + + test('should close modal when clicking outside of modal-content', function () { + stop() + $.support.transition = false + var div = $('') + div + .bind('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 () { + ok(!$('#modal-test').is(':visible'), 'modal hidden') + div.remove() + start() + }) + .modal('show') + }) + + test('should trigger hide event once when clicking outside of modal-content', function () { + stop() + $.support.transition = false + + var triggered + var div = $('') + + div + .bind('shown.bs.modal', function () { + triggered = 0 + $('#modal-test').click() + }) + .bind('hide.bs.modal', function () { + triggered += 1 + ok(triggered === 1, 'modal hide triggered once') + start() + }) + .modal('show') + }) + + test('should close reopened modal with [data-dismiss=modal] click', function () { + stop() + $.support.transition = false + var div = $('') + div + .bind('shown.bs.modal', function () { + $('#close').click() + ok(!$('#modal-test').is(':visible'), 'modal hidden') + }) + .one('hidden.bs.modal', function () { + div.one('hidden.bs.modal', function () { start() - }) - .modal('show') - }) - - test('should fire show event', function () { - stop() - $.support.transition = false - $('') - .on('show.bs.modal', function () { - ok(true, 'show was called') - }) - .on('shown.bs.modal', function () { - $(this).remove() - start() - }) - .modal('show') - }) - - test('should not fire shown when default prevented', function () { - stop() - $.support.transition = false - $('') - .on('show.bs.modal', function (e) { - e.preventDefault() - ok(true, 'show was called') - start() - }) - .on('shown.bs.modal', function () { - ok(false, 'shown was called') - }) - .modal('show') - }) - - test('should hide modal when hide is called', function () { - stop() - $.support.transition = false - - $('') - .on('shown.bs.modal', function () { - ok($('#modal-test').is(':visible'), 'modal visible') - ok($('#modal-test').length, 'modal inserted into dom') - $(this).modal('hide') - }) - .on('hidden.bs.modal', function () { - ok(!$('#modal-test').is(':visible'), 'modal hidden') - $('#modal-test').remove() - start() - }) - .modal('show') - }) - - test('should toggle when toggle is called', function () { - stop() - $.support.transition = false - var div = $('') - div - .on('shown.bs.modal', function () { - ok($('#modal-test').is(':visible'), 'modal visible') - ok($('#modal-test').length, 'modal inserted into dom') - div.modal('toggle') - }) - .on('hidden.bs.modal', function () { - ok(!$('#modal-test').is(':visible'), 'modal hidden') - div.remove() - start() - }) - .modal('toggle') - }) - - test('should remove from dom when click [data-dismiss=modal]', function () { - stop() - $.support.transition = false - var div = $('') - div - .on('shown.bs.modal', function () { - ok($('#modal-test').is(':visible'), 'modal visible') - ok($('#modal-test').length, 'modal inserted into dom') - div.find('.close').click() - }) - .on('hidden.bs.modal', function () { - ok(!$('#modal-test').is(':visible'), 'modal hidden') - div.remove() - start() - }) - .modal('toggle') - }) - - test('should allow modal close with "backdrop:false"', function () { - stop() - $.support.transition = false - var div = $('
', { id: 'modal-test', 'data-backdrop': false }) - div - .on('shown.bs.modal', function () { - ok($('#modal-test').is(':visible'), 'modal visible') - div.modal('hide') - }) - .on('hidden.bs.modal', function () { - ok(!$('#modal-test').is(':visible'), 'modal hidden') - div.remove() - start() - }) - .modal('show') - }) - - test('should close modal when clicking outside of modal-content', function () { - stop() - $.support.transition = false - var div = $('') - div - .bind('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 () { - ok(!$('#modal-test').is(':visible'), 'modal hidden') - div.remove() - start() - }) - .modal('show') - }) - - test('should trigger hide event once when clicking outside of modal-content', function () { - stop() - $.support.transition = false - - var triggered - var div = $('') - - div - .bind('shown.bs.modal', function () { - triggered = 0 - $('#modal-test').click() - }) - .bind('hide.bs.modal', function () { - triggered += 1 - ok(triggered === 1, 'modal hide triggered once') - start() - }) - .modal('show') - }) - - test('should close reopened modal with [data-dismiss=modal] click', function () { - stop() - $.support.transition = false - var div = $('') - div - .bind('shown.bs.modal', function () { - $('#close').click() - ok(!$('#modal-test').is(':visible'), 'modal hidden') - }) - .one('hidden.bs.modal', function () { - div.one('hidden.bs.modal', function () { - start() - }).modal('show') - }) - .modal('show') - - div.remove() - }) + }).modal('show') + }) + .modal('show') + + div.remove() + }) }) diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js index ecab948c7..c08b6d8ef 100644 --- a/js/tests/unit/popover.js +++ b/js/tests/unit/popover.js @@ -1,133 +1,133 @@ $(function () { - module('popover') - - test('should provide no conflict', function () { - var popover = $.fn.popover.noConflict() - ok(!$.fn.popover, 'popover was set back to undefined (org value)') - $.fn.popover = popover + module('popover') + + test('should provide no conflict', function () { + var popover = $.fn.popover.noConflict() + ok(!$.fn.popover, 'popover was set back to undefined (org value)') + $.fn.popover = popover + }) + + test('should be defined on jquery object', function () { + var div = $('
') + ok(div.popover, 'popover method is defined') + }) + + test('should return element', function () { + var div = $('
') + ok(div.popover() == div, 'document.body returned') + }) + + test('should render popover element', function () { + $.support.transition = false + var popover = $('@mdo') + .appendTo('#qunit-fixture') + .popover('show') + + ok($('.popover').length, 'popover was inserted') + popover.popover('hide') + ok(!$('.popover').length, 'popover removed') + }) + + test('should store popover instance in popover data object', function () { + $.support.transition = false + var popover = $('@mdo') + .popover() + + ok(!!popover.data('bs.popover'), 'popover instance exists') + }) + + test('should get title and content from options', function () { + $.support.transition = false + var popover = $('@fat') + .appendTo('#qunit-fixture') + .popover({ + title: function () { + return '@fat' + }, + content: function () { + return 'loves writing tests （╯°□°）╯︵ ┻━┻' + } }) - test('should be defined on jquery object', function () { - var div = $('
') - ok(div.popover, 'popover method is defined') + popover.popover('show') + + ok($('.popover').length, 'popover was inserted') + equal($('.popover .popover-title').text(), '@fat', 'title correctly inserted') + equal($('.popover .popover-content').text(), 'loves writing tests （╯°□°）╯︵ ┻━┻', 'content correctly inserted') + + popover.popover('hide') + ok(!$('.popover').length, 'popover was removed') + $('#qunit-fixture').empty() + }) + + test('should get title and content from attributes', function () { + $.support.transition = false + var popover = $('@mdo') + .appendTo('#qunit-fixture') + .popover() + .popover('show') + + ok($('.popover').length, 'popover was inserted') + equal($('.popover .popover-title').text(), '@mdo', 'title correctly inserted') + equal($('.popover .popover-content').text(), 'loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻', 'content correctly inserted') + + popover.popover('hide') + ok(!$('.popover').length, 'popover was removed') + $('#qunit-fixture').empty() + }) + + + test('should get title and content from attributes #2', function () { + $.support.transition = false + var popover = $('@mdo') + .appendTo('#qunit-fixture') + .popover({ + title: 'ignored title option', + content: 'ignored content option' }) - - test('should return element', function () { - var div = $('
') - ok(div.popover() == div, 'document.body returned') + .popover('show') + + ok($('.popover').length, 'popover was inserted') + equal($('.popover .popover-title').text(), '@mdo', 'title correctly inserted') + equal($('.popover .popover-content').text(), 'loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻', 'content correctly inserted') + + popover.popover('hide') + ok(!$('.popover').length, 'popover was removed') + $('#qunit-fixture').empty() + }) + + test('should respect custom classes', function () { + $.support.transition = false + var popover = $('@fat') + .appendTo('#qunit-fixture') + .popover({ + title: 'Test', + content: 'Test', + template: '

' }) - test('should render popover element', function () { - $.support.transition = false - var popover = $('@mdo') - .appendTo('#qunit-fixture') - .popover('show') - - ok($('.popover').length, 'popover was inserted') - popover.popover('hide') - ok(!$('.popover').length, 'popover removed') - }) - - test('should store popover instance in popover data object', function () { - $.support.transition = false - var popover = $('@mdo') - .popover() - - ok(!!popover.data('bs.popover'), 'popover instance exists') - }) - - test('should get title and content from options', function () { - $.support.transition = false - var popover = $('@fat') - .appendTo('#qunit-fixture') - .popover({ - title: function () { - return '@fat' - }, - content: function () { - return 'loves writing tests （╯°□°）╯︵ ┻━┻' - } - }) - - popover.popover('show') - - ok($('.popover').length, 'popover was inserted') - equal($('.popover .popover-title').text(), '@fat', 'title correctly inserted') - equal($('.popover .popover-content').text(), 'loves writing tests （╯°□°）╯︵ ┻━┻', 'content correctly inserted') - - popover.popover('hide') - ok(!$('.popover').length, 'popover was removed') - $('#qunit-fixture').empty() - }) - - test('should get title and content from attributes', function () { - $.support.transition = false - var popover = $('@mdo') - .appendTo('#qunit-fixture') - .popover() - .popover('show') - - ok($('.popover').length, 'popover was inserted') - equal($('.popover .popover-title').text(), '@mdo', 'title correctly inserted') - equal($('.popover .popover-content').text(), 'loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻', 'content correctly inserted') - - popover.popover('hide') - ok(!$('.popover').length, 'popover was removed') - $('#qunit-fixture').empty() - }) - - - test('should get title and content from attributes #2', function () { - $.support.transition = false - var popover = $('@mdo') - .appendTo('#qunit-fixture') - .popover({ - title: 'ignored title option', - content: 'ignored content option' - }) - .popover('show') - - ok($('.popover').length, 'popover was inserted') - equal($('.popover .popover-title').text(), '@mdo', 'title correctly inserted') - equal($('.popover .popover-content').text(), 'loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻', 'content correctly inserted') - - popover.popover('hide') - ok(!$('.popover').length, 'popover was removed') - $('#qunit-fixture').empty() - }) - - test('should respect custom classes', function () { - $.support.transition = false - var popover = $('@fat') - .appendTo('#qunit-fixture') - .popover({ - title: 'Test', - content: 'Test', - template: '

' - }) - - popover.popover('show') - - ok($('.popover').length, 'popover was inserted') - ok($('.popover').hasClass('foobar'), 'custom class is present') - - popover.popover('hide') - ok(!$('.popover').length, 'popover was removed') - $('#qunit-fixture').empty() - }) - - test('should destroy popover', function () { - var popover = $('
').popover({trigger: 'hover'}).on('click.foo', function () {}) - 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') - popover.popover('destroy') - ok(!popover.hasClass('in'), 'popover is hidden') - ok(!popover.data('popover'), 'popover does not have data') - ok($._data(popover[0],'events').click[0].namespace == 'foo', 'popover still has click.foo') - ok(!$._data(popover[0], 'events').mouseover && !$._data(popover[0], 'events').mouseout, 'popover does not have any events') - }) + popover.popover('show') + + ok($('.popover').length, 'popover was inserted') + ok($('.popover').hasClass('foobar'), 'custom class is present') + + popover.popover('hide') + ok(!$('.popover').length, 'popover was removed') + $('#qunit-fixture').empty() + }) + + test('should destroy popover', function () { + var popover = $('
').popover({trigger: 'hover'}).on('click.foo', function () {}) + 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') + popover.popover('destroy') + ok(!popover.hasClass('in'), 'popover is hidden') + ok(!popover.data('popover'), 'popover does not have data') + ok($._data(popover[0],'events').click[0].namespace == 'foo', 'popover still has click.foo') + ok(!$._data(popover[0], 'events').mouseover && !$._data(popover[0], 'events').mouseout, 'popover does not have any events') + }) }) diff --git a/js/tests/unit/scrollspy.js b/js/tests/unit/scrollspy.js index cf7b50dc4..694af95c6 100644 --- a/js/tests/unit/scrollspy.js +++ b/js/tests/unit/scrollspy.js @@ -1,36 +1,36 @@ $(function () { - module('scrollspy') + module('scrollspy') - test('should provide no conflict', function () { - var scrollspy = $.fn.scrollspy.noConflict() - ok(!$.fn.scrollspy, 'scrollspy was set back to undefined (org value)') - $.fn.scrollspy = scrollspy - }) + test('should provide no conflict', function () { + var scrollspy = $.fn.scrollspy.noConflict() + ok(!$.fn.scrollspy, 'scrollspy was set back to undefined (org value)') + $.fn.scrollspy = scrollspy + }) - test('should be defined on jquery object', function () { - ok($(document.body).scrollspy, 'scrollspy method is defined') - }) + test('should be defined on jquery object', function () { + ok($(document.body).scrollspy, 'scrollspy method is defined') + }) - test('should return element', function () { - ok($(document.body).scrollspy()[0] == document.body, 'document.body returned') - }) + test('should return element', function () { + ok($(document.body).scrollspy()[0] == document.body, 'document.body returned') + }) - test('should switch active class on scroll', function () { - var sectionHTML = '
' - $section = $(sectionHTML).append('#qunit-fixture'), - topbarHTML = '
' + - '
' + - '
' + - '

Bootstrap

' + - '
  • Overview
    • ' + - '' + - '
    ' + - '
    ' + - '
    ', - $topbar = $(topbarHTML).scrollspy() + test('should switch active class on scroll', function () { + var sectionHTML = '
    ', + $section = $(sectionHTML).append('#qunit-fixture'), + topbarHTML = '
    ' + + '
    ' + + '
    ' + + '

    Bootstrap

    ' + + '
  • Overview
    • ' + + '' + + '
    ' + + '
    ' + + '
    ', + $topbar = $(topbarHTML).scrollspy() - ok($topbar.find('.active', true)) - }) + ok($topbar.find('.active', true)) + }) }) diff --git a/js/tests/unit/tab.js b/js/tests/unit/tab.js index b8dbf2c18..60e46364d 100644 --- a/js/tests/unit/tab.js +++ b/js/tests/unit/tab.js @@ -1,86 +1,86 @@ $(function () { - module('tabs') + module('tabs') - test('should provide no conflict', function () { - var tab = $.fn.tab.noConflict() - ok(!$.fn.tab, 'tab was set back to undefined (org value)') - $.fn.tab = tab - }) + test('should provide no conflict', function () { + var tab = $.fn.tab.noConflict() + ok(!$.fn.tab, 'tab was set back to undefined (org value)') + $.fn.tab = tab + }) - test('should be defined on jquery object', function () { - ok($(document.body).tab, 'tabs method is defined') - }) + test('should be defined on jquery object', function () { + ok($(document.body).tab, 'tabs method is defined') + }) - test('should return element', function () { - ok($(document.body).tab()[0] == document.body, 'document.body returned') - }) + test('should return element', function () { + ok($(document.body).tab()[0] == document.body, 'document.body returned') + }) - test('should activate element by tab id', function () { - var tabsHTML = '' + test('should activate element by tab id', function () { + var tabsHTML = '' - $('
    ').appendTo('#qunit-fixture') + $('
    ').appendTo('#qunit-fixture') - $(tabsHTML).find('li:last a').tab('show') - equal($('#qunit-fixture').find('.active').attr('id'), 'profile') + $(tabsHTML).find('li:last a').tab('show') + equal($('#qunit-fixture').find('.active').attr('id'), 'profile') - $(tabsHTML).find('li:first a').tab('show') - equal($('#qunit-fixture').find('.active').attr('id'), 'home') - }) + $(tabsHTML).find('li:first a').tab('show') + equal($('#qunit-fixture').find('.active').attr('id'), 'home') + }) - test('should activate element by tab id', function () { - var pillsHTML = '' + test('should activate element by tab id', function () { + var pillsHTML = '' - $('
    ').appendTo('#qunit-fixture') + $('
    ').appendTo('#qunit-fixture') - $(pillsHTML).find('li:last a').tab('show') - equal($('#qunit-fixture').find('.active').attr('id'), 'profile') + $(pillsHTML).find('li:last a').tab('show') + equal($('#qunit-fixture').find('.active').attr('id'), 'profile') - $(pillsHTML).find('li:first a').tab('show') - equal($('#qunit-fixture').find('.active').attr('id'), 'home') - }) + $(pillsHTML).find('li:first a').tab('show') + equal($('#qunit-fixture').find('.active').attr('id'), 'home') + }) - test('should not fire closed when close is prevented', function () { - $.support.transition = false - stop(); - $('
    ') - .on('show.bs.tab', function (e) { - e.preventDefault(); - ok(true); - start(); - }) - .on('shown.bs.tab', function () { - ok(false); - }) - .tab('show') + test('should not fire closed when close is prevented', function () { + $.support.transition = false + stop(); + $('
    ') + .on('show.bs.tab', function (e) { + e.preventDefault(); + ok(true); + start(); }) - - test('show and shown events should reference correct relatedTarget', function () { - var dropHTML = '
      ' + - '
    • 1' + - '' + - '
      • ' + - '
    ' - - $(dropHTML).find('ul>li:first a').tab('show').end() - .find('ul>li:last a') - .on('show.bs.tab', function (event) { - equal(event.relatedTarget.hash, '#1-1') - }) - .on('show.bs.tab', function (event) { - equal(event.relatedTarget.hash, '#1-1') - }) - .tab('show') + .on('shown.bs.tab', function () { + ok(false); + }) + .tab('show') + }) + + test('show and shown events should reference correct relatedTarget', function () { + var dropHTML = '
      ' + + '
    • 1' + + '' + + '
      • ' + + '
    ' + + $(dropHTML).find('ul>li:first a').tab('show').end() + .find('ul>li:last a') + .on('show.bs.tab', function (event) { + equal(event.relatedTarget.hash, '#1-1') + }) + .on('show.bs.tab', function (event) { + equal(event.relatedTarget.hash, '#1-1') }) + .tab('show') + }) }) diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index b9b003dd1..c3af7d82e 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -1,432 +1,432 @@ $(function () { - module('tooltip') - - test('should provide no conflict', function () { - var tooltip = $.fn.tooltip.noConflict() - ok(!$.fn.tooltip, 'tooltip was set back to undefined (org value)') - $.fn.tooltip = tooltip - }) - - test('should be defined on jquery object', function () { - var div = $('
    ') - ok(div.tooltip, 'popover method is defined') - }) - - test('should return element', function () { - var div = $('
    ') - ok(div.tooltip() == div, 'document.body returned') - }) - - test('should expose default settings', function () { - ok(!!$.fn.tooltip.Constructor.DEFAULTS, 'defaults is defined') - }) - - test('should empty title attribute', function () { - var tooltip = $('').tooltip() - ok(tooltip.attr('title') === '', 'title attribute was emptied') - }) - - test('should add data attribute for referencing original title', function () { - var tooltip = $('').tooltip() - equal(tooltip.attr('data-original-title'), 'Another tooltip', 'original title preserved in data attribute') - }) - - test('should place tooltips relative to placement option', function () { - $.support.transition = false - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({placement: 'bottom'}) - .tooltip('show') - - ok($('.tooltip').is('.fade.bottom.in'), 'has correct classes applied') - tooltip.tooltip('hide') - }) - - test('should allow html entities', function () { - $.support.transition = false - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({html: true}) - .tooltip('show') - - ok($('.tooltip b').length, 'b tag was inserted') - tooltip.tooltip('hide') - ok(!$('.tooltip').length, 'tooltip removed') - }) - - test('should respect custom classes', function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({ template: '
    '}) - .tooltip('show') - - ok($('.tooltip').hasClass('some-class'), 'custom class is present') - tooltip.tooltip('hide') - ok(!$('.tooltip').length, 'tooltip removed') - }) - - test('should fire show event', function () { - stop() - var tooltip = $('
    ') - .on('show.bs.tooltip', function () { - ok(true, 'show was called') - start() - }) - .tooltip('show') - }) - - test('should fire shown event', function () { - stop() - var tooltip = $('
    ') - .on('shown.bs.tooltip', function () { - ok(true, 'shown was called') - start() - }) - .tooltip('show') - }) - - test('should not fire shown event when default prevented', function () { - stop() - var tooltip = $('
    ') - .on('show.bs.tooltip', function (e) { - e.preventDefault() - ok(true, 'show was called') - start() - }) - .on('shown.bs.tooltip', function () { - ok(false, 'shown was called') - }) - .tooltip('show') - }) - - test('should fire hide event', function () { - stop() - var tooltip = $('
    ') - .on('shown.bs.tooltip', function () { - $(this).tooltip('hide') - }) - .on('hide.bs.tooltip', function () { - ok(true, 'hide was called') - start() - }) - .tooltip('show') - }) - - test('should fire hidden event', function () { - stop() - var tooltip = $('
    ') - .on('shown.bs.tooltip', function () { - $(this).tooltip('hide') - }) - .on('hidden.bs.tooltip', function () { - ok(true, 'hidden was called') - start() - }) - .tooltip('show') - }) - - test('should not fire hidden event when default prevented', function () { - stop() - var tooltip = $('
    ') - .on('shown.bs.tooltip', function () { - $(this).tooltip('hide') - }) - .on('hide.bs.tooltip', function (e) { - e.preventDefault() - ok(true, 'hide was called') - start() - }) - .on('hidden.bs.tooltip', function () { - ok(false, 'hidden was called') - }) - .tooltip('show') - }) - - test('should not show tooltip if leave event occurs before delay expires', function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({ delay: 200 }) - - stop() - - tooltip.trigger('mouseenter') - - setTimeout(function () { - ok(!$('.tooltip').is('.fade.in'), 'tooltip is not faded in') - tooltip.trigger('mouseout') - setTimeout(function () { - ok(!$('.tooltip').is('.fade.in'), 'tooltip is not faded in') - start() - }, 200) - }, 100) - }) - - test('should not show tooltip if leave event occurs before delay expires, even if hide delay is 0', function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({ delay: { show: 200, hide: 0} }) - - stop() - - tooltip.trigger('mouseenter') - - setTimeout(function () { - ok(!$('.tooltip').is('.fade.in'), 'tooltip is not faded in') - tooltip.trigger('mouseout') - setTimeout(function () { - ok(!$('.tooltip').is('.fade.in'), 'tooltip is not faded in') - start() - }, 200) - }, 100) - }) - - test('should wait 200 ms before hiding the tooltip', 3, function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({ delay: { show: 0, hide: 200} }) - - stop() - - tooltip.trigger('mouseenter') - + module('tooltip') + + test('should provide no conflict', function () { + var tooltip = $.fn.tooltip.noConflict() + ok(!$.fn.tooltip, 'tooltip was set back to undefined (org value)') + $.fn.tooltip = tooltip + }) + + test('should be defined on jquery object', function () { + var div = $('
    ') + ok(div.tooltip, 'popover method is defined') + }) + + test('should return element', function () { + var div = $('
    ') + ok(div.tooltip() == div, 'document.body returned') + }) + + test('should expose default settings', function () { + ok(!!$.fn.tooltip.Constructor.DEFAULTS, 'defaults is defined') + }) + + test('should empty title attribute', function () { + var tooltip = $('').tooltip() + ok(tooltip.attr('title') === '', 'title attribute was emptied') + }) + + test('should add data attribute for referencing original title', function () { + var tooltip = $('').tooltip() + equal(tooltip.attr('data-original-title'), 'Another tooltip', 'original title preserved in data attribute') + }) + + test('should place tooltips relative to placement option', function () { + $.support.transition = false + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({placement: 'bottom'}) + .tooltip('show') + + ok($('.tooltip').is('.fade.bottom.in'), 'has correct classes applied') + tooltip.tooltip('hide') + }) + + test('should allow html entities', function () { + $.support.transition = false + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({html: true}) + .tooltip('show') + + ok($('.tooltip b').length, 'b tag was inserted') + tooltip.tooltip('hide') + ok(!$('.tooltip').length, 'tooltip removed') + }) + + test('should respect custom classes', function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({ template: '
    '}) + .tooltip('show') + + ok($('.tooltip').hasClass('some-class'), 'custom class is present') + tooltip.tooltip('hide') + ok(!$('.tooltip').length, 'tooltip removed') + }) + + test('should fire show event', function () { + stop() + var tooltip = $('
    ') + .on('show.bs.tooltip', function () { + ok(true, 'show was called') + start() + }) + .tooltip('show') + }) + + test('should fire shown event', function () { + stop() + var tooltip = $('
    ') + .on('shown.bs.tooltip', function () { + ok(true, 'shown was called') + start() + }) + .tooltip('show') + }) + + test('should not fire shown event when default prevented', function () { + stop() + var tooltip = $('
    ') + .on('show.bs.tooltip', function (e) { + e.preventDefault() + ok(true, 'show was called') + start() + }) + .on('shown.bs.tooltip', function () { + ok(false, 'shown was called') + }) + .tooltip('show') + }) + + test('should fire hide event', function () { + stop() + var tooltip = $('
    ') + .on('shown.bs.tooltip', function () { + $(this).tooltip('hide') + }) + .on('hide.bs.tooltip', function () { + ok(true, 'hide was called') + start() + }) + .tooltip('show') + }) + + test('should fire hidden event', function () { + stop() + var tooltip = $('
    ') + .on('shown.bs.tooltip', function () { + $(this).tooltip('hide') + }) + .on('hidden.bs.tooltip', function () { + ok(true, 'hidden was called') + start() + }) + .tooltip('show') + }) + + test('should not fire hidden event when default prevented', function () { + stop() + var tooltip = $('
    ') + .on('shown.bs.tooltip', function () { + $(this).tooltip('hide') + }) + .on('hide.bs.tooltip', function (e) { + e.preventDefault() + ok(true, 'hide was called') + start() + }) + .on('hidden.bs.tooltip', function () { + ok(false, 'hidden was called') + }) + .tooltip('show') + }) + + test('should not show tooltip if leave event occurs before delay expires', function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({ delay: 200 }) + + stop() + + tooltip.trigger('mouseenter') + + setTimeout(function () { + ok(!$('.tooltip').is('.fade.in'), 'tooltip is not faded in') + tooltip.trigger('mouseout') + setTimeout(function () { + ok(!$('.tooltip').is('.fade.in'), 'tooltip is not faded in') + start() + }, 200) + }, 100) + }) + + test('should not show tooltip if leave event occurs before delay expires, even if hide delay is 0', function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({ delay: { show: 200, hide: 0} }) + + stop() + + tooltip.trigger('mouseenter') + + setTimeout(function () { + ok(!$('.tooltip').is('.fade.in'), 'tooltip is not faded in') + tooltip.trigger('mouseout') + setTimeout(function () { + ok(!$('.tooltip').is('.fade.in'), 'tooltip is not faded in') + start() + }, 200) + }, 100) + }) + + test('should wait 200 ms before hiding the tooltip', 3, function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({ delay: { show: 0, hide: 200} }) + + stop() + + tooltip.trigger('mouseenter') + + setTimeout(function () { + ok($('.tooltip').is('.fade.in'), 'tooltip is faded in') + tooltip.trigger('mouseout') + setTimeout(function () { + ok($('.tooltip').is('.fade.in'), '100ms:tooltip is still faded in') setTimeout(function () { - ok($('.tooltip').is('.fade.in'), 'tooltip is faded in') - tooltip.trigger('mouseout') - setTimeout(function () { - ok($('.tooltip').is('.fade.in'), '100ms:tooltip is still faded in') - setTimeout(function () { - ok(!$('.tooltip').is('.in'), 'tooltip removed') - start() - }, 150) - }, 100) - }, 1) - }) + ok(!$('.tooltip').is('.in'), 'tooltip removed') + start() + }, 150) + }, 100) + }, 1) + }) - test('should not hide tooltip if leave event occurs, then tooltip is show immediately again', function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({ delay: { show: 0, hide: 200} }) + test('should not hide tooltip if leave event occurs, then tooltip is show immediately again', function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({ delay: { show: 0, hide: 200} }) - stop() + stop() - tooltip.trigger('mouseenter') + tooltip.trigger('mouseenter') - setTimeout(function () { - ok($('.tooltip').is('.fade.in'), 'tooltip is faded in') - tooltip.trigger('mouseout') - setTimeout(function () { - ok($('.tooltip').is('.fade.in'), '100ms:tooltip is still faded in') - tooltip.trigger('mouseenter') - setTimeout(function () { - ok($('.tooltip').is('.in'), 'tooltip removed') - start() - }, 150) - }, 100) - }, 1) - }) - - test('should not show tooltip if leave event occurs before delay expires', function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({ delay: 100 }) - stop() + setTimeout(function () { + ok($('.tooltip').is('.fade.in'), 'tooltip is faded in') + tooltip.trigger('mouseout') + setTimeout(function () { + ok($('.tooltip').is('.fade.in'), '100ms:tooltip is still faded in') tooltip.trigger('mouseenter') setTimeout(function () { - ok(!$('.tooltip').is('.fade.in'), 'tooltip is not faded in') - tooltip.trigger('mouseout') - setTimeout(function () { - ok(!$('.tooltip').is('.fade.in'), 'tooltip is not faded in') - start() - }, 100) - }, 50) - }) - - test('should show tooltip if leave event hasn\'t occured before delay expires', function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({ delay: 150 }) - stop() - tooltip.trigger('mouseenter') - setTimeout(function () { - ok(!$('.tooltip').is('.fade.in'), 'tooltip is not faded in') - }, 100) - setTimeout(function () { - ok($('.tooltip').is('.fade.in'), 'tooltip has faded in') + ok($('.tooltip').is('.in'), 'tooltip removed') start() - }, 200) - }) - - test('should destroy tooltip', function () { - var tooltip = $('
    ').tooltip().on('click.foo', function () {}) - 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], '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') - }) - - test('should show tooltip with delegate selector on click', function () { - var div = $('
    ') - var tooltip = div.appendTo('#qunit-fixture') - .tooltip({ selector: 'a[rel=tooltip]', - trigger: 'click' }) - div.find('a').trigger('click') - ok($('.tooltip').is('.fade.in'), 'tooltip is faded in') - }) - - test('should show tooltip when toggle is called', function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({trigger: 'manual'}) - .tooltip('toggle') - ok($('.tooltip').is('.fade.in'), 'tooltip should be toggled in') - }) - - test('should place tooltips inside the body', function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({container: 'body'}) - .tooltip('show') - ok($('body > .tooltip').length, 'inside the body') - ok(!$('#qunit-fixture > .tooltip').length, 'not found in parent') - tooltip.tooltip('hide') - }) - - test('should place tooltip inside window', function () { - var container = $('
    ').appendTo('body') - .css({position: 'absolute', width: 200, height: 200, bottom: 0, left: 0}), - tooltip = $('Hover me') - .css({position: 'absolute', top: 0, left: 0}) + }, 150) + }, 100) + }, 1) + }) + + test('should not show tooltip if leave event occurs before delay expires', function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({ delay: 100 }) + stop() + tooltip.trigger('mouseenter') + setTimeout(function () { + ok(!$('.tooltip').is('.fade.in'), 'tooltip is not faded in') + tooltip.trigger('mouseout') + setTimeout(function () { + ok(!$('.tooltip').is('.fade.in'), 'tooltip is not faded in') + start() + }, 100) + }, 50) + }) + + test('should show tooltip if leave event hasn\'t occured before delay expires', function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({ delay: 150 }) + stop() + tooltip.trigger('mouseenter') + setTimeout(function () { + ok(!$('.tooltip').is('.fade.in'), 'tooltip is not faded in') + }, 100) + setTimeout(function () { + ok($('.tooltip').is('.fade.in'), 'tooltip has faded in') + start() + }, 200) + }) + + test('should destroy tooltip', function () { + var tooltip = $('
    ').tooltip().on('click.foo', function () {}) + 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], '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') + }) + + test('should show tooltip with delegate selector on click', function () { + var div = $('
    ') + var tooltip = div.appendTo('#qunit-fixture') + .tooltip({ selector: 'a[rel=tooltip]', + trigger: 'click' }) + div.find('a').trigger('click') + ok($('.tooltip').is('.fade.in'), 'tooltip is faded in') + }) + + test('should show tooltip when toggle is called', function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({trigger: 'manual'}) + .tooltip('toggle') + ok($('.tooltip').is('.fade.in'), 'tooltip should be toggled in') + }) + + test('should place tooltips inside the body', function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({container: 'body'}) + .tooltip('show') + ok($('body > .tooltip').length, 'inside the body') + ok(!$('#qunit-fixture > .tooltip').length, 'not found in parent') + tooltip.tooltip('hide') + }) + + test('should place tooltip inside window', function () { + var container = $('
    ').appendTo('body') + .css({position: 'absolute', width: 200, height: 200, bottom: 0, left: 0}), + tooltip = $('Hover me') + .css({position: 'absolute', top: 0, left: 0}) + .appendTo(container) + .tooltip({placement: 'top', animate: false}) + .tooltip('show') + + stop() + + setTimeout(function () { + ok($('.tooltip').offset().left >= 0) + + start() + container.remove() + }, 100) + }) + + test('should place tooltip on top of element', function () { + var container = $('
    ').appendTo('body') + .css({position: 'absolute', bottom: 0, left: 0, textAlign: 'right', width: 300, height: 300}), + p = $('

    ').appendTo(container), + tooltiped = $('Hover me') + .css({marginTop: 200}) + .appendTo(p) + .tooltip({placement: 'top', animate: false}) + .tooltip('show') + + stop() + + setTimeout(function () { + var tooltip = container.find('.tooltip') + + start() + ok(Math.round(tooltip.offset().top + tooltip.outerHeight()) <= Math.round(tooltiped.offset().top)) + container.remove() + }, 100) + }) + + test('should add position class before positioning so that position-specific styles are taken into account', function () { + $('head').append('') + + var container = $('

    ').appendTo('body'), + target = $('') .appendTo(container) - .tooltip({placement: 'top', animate: false}) - .tooltip('show') - - stop() - - setTimeout(function () { - ok($('.tooltip').offset().left >= 0) - - start() - container.remove() - }, 100) - }) - - test('should place tooltip on top of element', function () { - var container = $('
    ').appendTo('body') - .css({position: 'absolute', bottom: 0, left: 0, textAlign: 'right', width: 300, height: 300}), - p = $('

    ').appendTo(container), - tooltiped = $('Hover me') - .css({marginTop: 200}) - .appendTo(p) - .tooltip({placement: 'top', animate: false}) - .tooltip('show') - - stop() - - setTimeout(function () { - var tooltip = container.find('.tooltip') - - start() - ok(Math.round(tooltip.offset().top + tooltip.outerHeight()) <= Math.round(tooltiped.offset().top)) - container.remove() - }, 100) - }) - - test('should add position class before positioning so that position-specific styles are taken into account', function () { - $('head').append('') - - var container = $('

    ').appendTo('body'), - target = $('') - .appendTo(container) - .tooltip({placement: 'right'}) - .tooltip('show'), - tooltip = container.find('.tooltip') - - // this is some dumb hack shit because sub pixels in firefox - var top = Math.round(target.offset().top + (target[0].offsetHeight / 2) - (tooltip[0].offsetHeight / 2)) - var top2 = Math.round(tooltip.offset().top) - var topDiff = top - top2 - ok(topDiff <= 1 && topDiff >= -1) - target.tooltip('hide') - }) - - test('tooltip title test #1', function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({ - }) - .tooltip('show') - equal($('.tooltip').children('.tooltip-inner').text(), 'Simple tooltip', 'title from title attribute is set') - tooltip.tooltip('hide') - ok(!$('.tooltip').length, 'tooltip removed') - }) - - test('tooltip title test #2', function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({ - title: 'This is a tooltip with some content' - }) - .tooltip('show') - equal($('.tooltip').children('.tooltip-inner').text(), 'Simple tooltip', 'title is set from title attribute while prefered over title option') - tooltip.tooltip('hide') - ok(!$('.tooltip').length, 'tooltip removed') - }) - - test('tooltip title test #3', function () { - var tooltip = $('') - .appendTo('#qunit-fixture') - .tooltip({ - title: 'This is a tooltip with some content' - }) - .tooltip('show') - equal($('.tooltip').children('.tooltip-inner').text(), 'This is a tooltip with some content', 'title from title option is set') - tooltip.tooltip('hide') - ok(!$('.tooltip').length, 'tooltip removed') - }) - - test('tooltips should be placed dynamically, with the dynamic placement option', function () { - $.support.transition = false - var ttContainer = $('
    ').css({ - 'height' : 400, - 'overflow' : 'hidden', - 'position' : 'absolute', - 'top' : 0, - 'left' : 0, - 'width' : 600}) - .appendTo('body') - - var topTooltip = $('
    Top Dynamic Tooltip
    ') - .appendTo('#dynamic-tt-test') - .tooltip({placement: 'auto'}) - .tooltip('show') - - ok($('.tooltip').is('.bottom'), 'top positioned tooltip is dynamically positioned bottom') - - topTooltip.tooltip('hide') - - var rightTooltip = $('
    Right Dynamic Tooltip
    ') - .appendTo('#dynamic-tt-test') - .tooltip({placement: 'right auto'}) - .tooltip('show') - - ok($('.tooltip').is('.left'), 'right positioned tooltip is dynamically positioned left') - rightTooltip.tooltip('hide') - - var leftTooltip = $('
    Left Dynamic Tooltip
    ') - .appendTo('#dynamic-tt-test') - .tooltip({placement: 'auto left'}) - .tooltip('show') - - ok($('.tooltip').is('.right'), 'left positioned tooltip is dynamically positioned right') - leftTooltip.tooltip('hide') - - ttContainer.remove() - }) + .tooltip({placement: 'right'}) + .tooltip('show'), + tooltip = container.find('.tooltip') + + // this is some dumb hack shit because sub pixels in firefox + var top = Math.round(target.offset().top + (target[0].offsetHeight / 2) - (tooltip[0].offsetHeight / 2)) + var top2 = Math.round(tooltip.offset().top) + var topDiff = top - top2 + ok(topDiff <= 1 && topDiff >= -1) + target.tooltip('hide') + }) + + test('tooltip title test #1', function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({}) + .tooltip('show') + equal($('.tooltip').children('.tooltip-inner').text(), 'Simple tooltip', 'title from title attribute is set') + tooltip.tooltip('hide') + ok(!$('.tooltip').length, 'tooltip removed') + }) + + test('tooltip title test #2', function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({ + title: 'This is a tooltip with some content' + }) + .tooltip('show') + equal($('.tooltip').children('.tooltip-inner').text(), 'Simple tooltip', 'title is set from title attribute while prefered over title option') + tooltip.tooltip('hide') + ok(!$('.tooltip').length, 'tooltip removed') + }) + + test('tooltip title test #3', function () { + var tooltip = $('') + .appendTo('#qunit-fixture') + .tooltip({ + title: 'This is a tooltip with some content' + }) + .tooltip('show') + equal($('.tooltip').children('.tooltip-inner').text(), 'This is a tooltip with some content', 'title from title option is set') + tooltip.tooltip('hide') + ok(!$('.tooltip').length, 'tooltip removed') + }) + + test('tooltips should be placed dynamically, with the dynamic placement option', function () { + $.support.transition = false + var ttContainer = $('
    ').css({ + 'height' : 400, + 'overflow' : 'hidden', + 'position' : 'absolute', + 'top' : 0, + 'left' : 0, + 'width' : 600 + }) + .appendTo('body') + + var topTooltip = $('
    Top Dynamic Tooltip
    ') + .appendTo('#dynamic-tt-test') + .tooltip({placement: 'auto'}) + .tooltip('show') + + ok($('.tooltip').is('.bottom'), 'top positioned tooltip is dynamically positioned bottom') + + topTooltip.tooltip('hide') + + var rightTooltip = $('
    Right Dynamic Tooltip
    ') + .appendTo('#dynamic-tt-test') + .tooltip({placement: 'right auto'}) + .tooltip('show') + + ok($('.tooltip').is('.left'), 'right positioned tooltip is dynamically positioned left') + rightTooltip.tooltip('hide') + + var leftTooltip = $('
    Left Dynamic Tooltip
    ') + .appendTo('#dynamic-tt-test') + .tooltip({placement: 'auto left'}) + .tooltip('show') + + ok($('.tooltip').is('.right'), 'left positioned tooltip is dynamically positioned right') + leftTooltip.tooltip('hide') + + ttContainer.remove() + }) }) -- cgit v1.2.3 From 69cb7be07f5673154da8cbbc838b03c32d3abe4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sun, 16 Feb 2014 19:28:43 +0100 Subject: Remove `curly: false` from `.jshintrc` --- js/.jshintrc | 1 - 1 file changed, 1 deletion(-) (limited to 'js') diff --git a/js/.jshintrc b/js/.jshintrc index ab4dfdfc9..9cd22f4a6 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -2,7 +2,6 @@ "asi" : true, "boss" : true, "browser" : true, - "curly" : false, "debug" : true, "devel" : true, "eqeqeq" : false, -- cgit v1.2.3 From 8a78bc065f866763607f104907b7a2ac9fa6ceec Mon Sep 17 00:00:00 2001 From: Heinrich Fenkart Date: Sun, 16 Feb 2014 20:06:31 +0100 Subject: Remove event aliases from JavaScript Makes life for people with custom jQuery builds excluding event aliases much easier. --- js/dropdown.js | 8 ++++---- js/modal.js | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'js') diff --git a/js/dropdown.js b/js/dropdown.js index 43d7ae3ea..6e206a0d1 100644 --- a/js/dropdown.js +++ b/js/dropdown.js @@ -44,7 +44,7 @@ .toggleClass('open') .trigger('shown.bs.dropdown', relatedTarget) - $this.focus() + $this.trigger('focus') } return false @@ -64,8 +64,8 @@ var isActive = $parent.hasClass('open') if (!isActive || (isActive && e.keyCode == 27)) { - if (e.which == 27) $parent.find(toggle).focus() - return $this.click() + if (e.which == 27) $parent.find(toggle).trigger('focus') + return $this.trigger('click') } var desc = ' li:not(.divider):visible a' @@ -79,7 +79,7 @@ if (e.keyCode == 40 && index < $items.length - 1) index++ // down if (!~index) index = 0 - $items.eq(index).focus() + $items.eq(index).trigger('focus') } function clearMenus(e) { diff --git a/js/modal.js b/js/modal.js index 20ff27046..f6dc477b1 100644 --- a/js/modal.js +++ b/js/modal.js @@ -78,10 +78,10 @@ transition ? that.$element.find('.modal-dialog') // wait for modal to slide in .one($.support.transition.end, function () { - that.$element.focus().trigger(e) + that.$element.trigger('focus').trigger(e) }) .emulateTransitionEnd(300) : - that.$element.focus().trigger(e) + that.$element.trigger('focus').trigger(e) }) } @@ -117,7 +117,7 @@ .off('focusin.bs.modal') // guard against infinite focus loop .on('focusin.bs.modal', $.proxy(function (e) { if (this.$element[0] !== e.target && !this.$element.has(e.target).length) { - this.$element.focus() + this.$element.trigger('focus') } }, this)) } @@ -232,7 +232,7 @@ $target .modal(option, this) .one('hide', function () { - $this.is(':visible') && $this.focus() + $this.is(':visible') && $this.trigger('focus') }) }) -- cgit v1.2.3 From a06e15dd368ea2b24b911c7f77892a2b19a58f98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Mon, 17 Feb 2014 20:56:46 +0100 Subject: Remove semicolons from JS tests --- js/tests/unit/alert.js | 10 ++++---- js/tests/unit/carousel.js | 62 +++++++++++++++++++++++------------------------ js/tests/unit/collapse.js | 8 +++--- js/tests/unit/tab.js | 10 ++++---- 4 files changed, 45 insertions(+), 45 deletions(-) (limited to 'js') diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js index 755d9d1e5..1de46e06f 100644 --- a/js/tests/unit/alert.js +++ b/js/tests/unit/alert.js @@ -46,15 +46,15 @@ $(function () { test('should not fire closed when close is prevented', function () { $.support.transition = false - stop(); + stop() $('
    ') .on('close.bs.alert', function (e) { - e.preventDefault(); - ok(true); - start(); + e.preventDefault() + ok(true) + start() }) .on('closed.bs.alert', function () { - ok(false); + ok(false) }) .alert('close') }) diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js index 6851e17a5..6f69855c7 100644 --- a/js/tests/unit/carousel.js +++ b/js/tests/unit/carousel.js @@ -21,12 +21,12 @@ $(function () { stop() $('
    ') .on('slide.bs.carousel', function (e) { - e.preventDefault(); - ok(true); - start(); + e.preventDefault() + ok(true) + start() }) .on('slid.bs.carousel', function () { - ok(false); + ok(false) }) .carousel('next') }) @@ -42,14 +42,14 @@ $(function () { ok($carousel.find('.item:eq(0)').is('.active')) ok($carousel.find('.carousel-indicators li:eq(0)').is('.active')) $carousel.carousel('next') - }, 1); + }, 1) }) $carousel.one('slid.bs.carousel', function () { setTimeout(function () { ok($carousel.find('.item:eq(1)').is('.active')) ok($carousel.find('.carousel-indicators li:eq(1)').is('.active')) start() - }, 1); + }, 1) }) $carousel.carousel('next') }) @@ -72,39 +72,39 @@ $(function () { stop() $(template) .on('slide.bs.carousel', function (e) { - e.preventDefault(); - ok(e.relatedTarget); - ok($(e.relatedTarget).hasClass('item')); - start(); + e.preventDefault() + ok(e.relatedTarget) + ok($(e.relatedTarget).hasClass('item')) + start() }) .carousel('next') }) test('should set interval from data attribute', 4, function () { - var template = $(''); - template.attr('data-interval', 1814); + var template = $('') + template.attr('data-interval', 1814) - template.appendTo('body'); - $('[data-slide]').first().click(); - ok($('#myCarousel').data('bs.carousel').options.interval == 1814); - $('#myCarousel').remove(); + template.appendTo('body') + $('[data-slide]').first().click() + 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'); - $('#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') + $('#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'); - $('#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') + $('#myCarousel').remove() - template.attr('data-interval', false); - template.appendTo('body'); - $('#myCarousel').carousel(1); - ok($('#myCarousel').data('bs.carousel').options.interval === false, 'data attribute has higher priority than default options'); - $('#myCarousel').remove(); + template.attr('data-interval', false) + template.appendTo('body') + $('#myCarousel').carousel(1) + ok($('#myCarousel').data('bs.carousel').options.interval === false, 'data attribute has higher priority than default options') + $('#myCarousel').remove() }) }) diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js index 133e6eab7..7948b3ab4 100644 --- a/js/tests/unit/collapse.js +++ b/js/tests/unit/collapse.js @@ -33,12 +33,12 @@ $(function () { stop() $('
    ') .on('show.bs.collapse', function (e) { - e.preventDefault(); - ok(true); - start(); + e.preventDefault() + ok(true) + start() }) .on('shown.bs.collapse', function () { - ok(false); + ok(false) }) .collapse('show') }) diff --git a/js/tests/unit/tab.js b/js/tests/unit/tab.js index 60e46364d..08f6e3cfd 100644 --- a/js/tests/unit/tab.js +++ b/js/tests/unit/tab.js @@ -49,15 +49,15 @@ $(function () { test('should not fire closed when close is prevented', function () { $.support.transition = false - stop(); + stop() $('
    ') .on('show.bs.tab', function (e) { - e.preventDefault(); - ok(true); - start(); + e.preventDefault() + ok(true) + start() }) .on('shown.bs.tab', function () { - ok(false); + ok(false) }) .tab('show') }) -- cgit v1.2.3 From a4dac463e082bbe11fef05e28f1430780d03980b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Tue, 18 Feb 2014 10:43:24 +0100 Subject: Improve `js/tests/index.html` - Improve comments. - Remove `transition.js` script load as `transition.js` unit test doesn't exist. --- js/tests/index.html | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'js') diff --git a/js/tests/index.html b/js/tests/index.html index 8c6e858e4..60f543abf 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -3,20 +3,20 @@ Bootstrap Plugin Test Suite - + - + - + @@ -30,8 +30,7 @@ - - + -- cgit v1.2.3 From 7a80b801d750387fe34d38835b48051512b95978 Mon Sep 17 00:00:00 2001 From: jonahss Date: Wed, 19 Feb 2014 21:27:50 -0800 Subject: updated qunit test reporting so sauce labs can report failing tests --- js/tests/index.html | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/tests/index.html b/js/tests/index.html index 60f543abf..c6d3d27af 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -11,8 +11,32 @@ -- cgit v1.2.3 From 63031a3ca5a44d828122226c26232c00f4463f98 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 26 Feb 2014 01:25:57 +0200 Subject: Bump grunt-jscs-checker. --- js/.jscs.json | 15 --------------- js/.jscsrc | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) delete mode 100644 js/.jscs.json create mode 100644 js/.jscsrc (limited to 'js') diff --git a/js/.jscs.json b/js/.jscs.json deleted file mode 100644 index 313bfb690..000000000 --- a/js/.jscs.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "disallowKeywords": ["with"], - "requireLeftStickedOperators": [","], - "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], - "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], - "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"], - "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], - "requireLineFeedAtFileEnd": true, - "requireRightStickedOperators": ["!"], - "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], - "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], - "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], - "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, - "validateLineBreaks": "LF" -} diff --git a/js/.jscsrc b/js/.jscsrc new file mode 100644 index 000000000..313bfb690 --- /dev/null +++ b/js/.jscsrc @@ -0,0 +1,15 @@ +{ + "disallowKeywords": ["with"], + "requireLeftStickedOperators": [","], + "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], + "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], + "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"], + "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], + "requireLineFeedAtFileEnd": true, + "requireRightStickedOperators": ["!"], + "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], + "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], + "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], + "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, + "validateLineBreaks": "LF" +} -- cgit v1.2.3 From 537e10033e055bc060ecbd57a678e6cfcfffed30 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 19 Feb 2014 09:11:05 +0200 Subject: Switch to using JSCS for the indentation check. --- js/.jscsrc | 3 ++- js/.jshintrc | 3 +-- js/tests/unit/tooltip.js | 25 ++++++++++++------------- 3 files changed, 15 insertions(+), 16 deletions(-) (limited to 'js') diff --git a/js/.jscsrc b/js/.jscsrc index 313bfb690..5fa37a0c9 100644 --- a/js/.jscsrc +++ b/js/.jscsrc @@ -1,15 +1,16 @@ { "disallowKeywords": ["with"], - "requireLeftStickedOperators": [","], "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"], "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], + "requireLeftStickedOperators": [","], "requireLineFeedAtFileEnd": true, "requireRightStickedOperators": ["!"], "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, + "validateIndentation": 2, "validateLineBreaks": "LF" } diff --git a/js/.jshintrc b/js/.jshintrc index ae8a0b404..6a47fe03b 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -7,8 +7,7 @@ "eqeqeq" : false, "eqnull" : true, "expr" : true, - "indent" : 2, "laxbreak" : true, "quotmark" : "single", "validthis": true -} \ No newline at end of file +} diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index c3af7d82e..f0ac577c6 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -273,8 +273,7 @@ $(function () { test('should show tooltip with delegate selector on click', function () { var div = $('
    ') var tooltip = div.appendTo('#qunit-fixture') - .tooltip({ selector: 'a[rel=tooltip]', - trigger: 'click' }) + .tooltip({ selector: 'a[rel=tooltip]', trigger: 'click' }) div.find('a').trigger('click') ok($('.tooltip').is('.fade.in'), 'tooltip is faded in') }) @@ -392,21 +391,21 @@ $(function () { test('tooltips should be placed dynamically, with the dynamic placement option', function () { $.support.transition = false var ttContainer = $('
    ').css({ - 'height' : 400, - 'overflow' : 'hidden', - 'position' : 'absolute', - 'top' : 0, - 'left' : 0, - 'width' : 600 - }) - .appendTo('body') + 'height' : 400, + 'overflow' : 'hidden', + 'position' : 'absolute', + 'top' : 0, + 'left' : 0, + 'width' : 600 + }) + .appendTo('body') var topTooltip = $('
    Top Dynamic Tooltip
    ') .appendTo('#dynamic-tt-test') .tooltip({placement: 'auto'}) .tooltip('show') - ok($('.tooltip').is('.bottom'), 'top positioned tooltip is dynamically positioned bottom') + ok($('.tooltip').is('.bottom'), 'top positioned tooltip is dynamically positioned bottom') topTooltip.tooltip('hide') @@ -415,7 +414,7 @@ $(function () { .tooltip({placement: 'right auto'}) .tooltip('show') - ok($('.tooltip').is('.left'), 'right positioned tooltip is dynamically positioned left') + ok($('.tooltip').is('.left'), 'right positioned tooltip is dynamically positioned left') rightTooltip.tooltip('hide') var leftTooltip = $('
    Left Dynamic Tooltip
    ') @@ -423,7 +422,7 @@ $(function () { .tooltip({placement: 'auto left'}) .tooltip('show') - ok($('.tooltip').is('.right'), 'left positioned tooltip is dynamically positioned right') + ok($('.tooltip').is('.right'), 'left positioned tooltip is dynamically positioned right') leftTooltip.tooltip('hide') ttContainer.remove() -- cgit v1.2.3 From d65f749390a32ec8c7abb09199bf31a7cca415ac Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 19 Feb 2014 09:11:25 +0200 Subject: Move the quotes check to JSCS. --- js/.jscsrc | 3 ++- js/.jshintrc | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/.jscsrc b/js/.jscsrc index 5fa37a0c9..7572481c7 100644 --- a/js/.jscsrc +++ b/js/.jscsrc @@ -12,5 +12,6 @@ "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!=="], "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, "validateIndentation": 2, - "validateLineBreaks": "LF" + "validateLineBreaks": "LF", + "validateQuoteMarks": "'" } diff --git a/js/.jshintrc b/js/.jshintrc index 6a47fe03b..e1ead322e 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -8,6 +8,5 @@ "eqnull" : true, "expr" : true, "laxbreak" : true, - "quotmark" : "single", "validthis": true } -- cgit v1.2.3 From 2619325626d25c2f7b342bfc17451e5ff451615f Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Wed, 19 Feb 2014 14:28:05 +0200 Subject: JSCS: Use more style checks. --- js/.jscsrc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'js') diff --git a/js/.jscsrc b/js/.jscsrc index 7572481c7..e8168b8b8 100644 --- a/js/.jscsrc +++ b/js/.jscsrc @@ -1,6 +1,9 @@ { + "disallowEmptyBlocks": true, "disallowKeywords": ["with"], "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], + "disallowMixedSpacesAndTabs": true, + "disallowMultipleLineStrings": true, "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"], "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], -- cgit v1.2.3 From be8f125ce6225222507f0b7329ea88b99207ac21 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 27 Feb 2014 17:38:37 +0200 Subject: Move `camelcase` check to JSCS. --- js/.jscsrc | 1 + 1 file changed, 1 insertion(+) (limited to 'js') diff --git a/js/.jscsrc b/js/.jscsrc index e8168b8b8..ceaffbcd5 100644 --- a/js/.jscsrc +++ b/js/.jscsrc @@ -7,6 +7,7 @@ "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"], "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], + "requireCamelCaseOrUpperCaseIdentifiers": true, "requireLeftStickedOperators": [","], "requireLineFeedAtFileEnd": true, "requireRightStickedOperators": ["!"], -- cgit v1.2.3 From 25450730247f4e77f30660f52762fa83e44d6fa1 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 27 Feb 2014 17:38:46 +0200 Subject: Move `trailing` check to JSCS. --- js/.jscsrc | 1 + 1 file changed, 1 insertion(+) (limited to 'js') diff --git a/js/.jscsrc b/js/.jscsrc index ceaffbcd5..2da777a22 100644 --- a/js/.jscsrc +++ b/js/.jscsrc @@ -7,6 +7,7 @@ "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="], "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"], "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], + "disallowTrailingWhitespace": true, "requireCamelCaseOrUpperCaseIdentifiers": true, "requireLeftStickedOperators": [","], "requireLineFeedAtFileEnd": true, -- cgit v1.2.3 From 297303a7cc73188d127cc7ac2f116e5c02feab1d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 6 Mar 2014 11:12:17 -0800 Subject: use quotes around all element attr vals in JS; fixes #12946 --- js/collapse.js | 4 ++-- js/dropdown.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'js') diff --git a/js/collapse.js b/js/collapse.js index 7130282b0..6907dda3a 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -148,7 +148,7 @@ // COLLAPSE DATA-API // ================= - $(document).on('click.bs.collapse.data-api', '[data-toggle=collapse]', function (e) { + $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) { var $this = $(this), href var target = $this.attr('data-target') || e.preventDefault() @@ -160,7 +160,7 @@ var $parent = parent && $(parent) if (!data || !data.transitioning) { - if ($parent) $parent.find('[data-toggle=collapse][data-parent="' + parent + '"]').not($this).addClass('collapsed') + if ($parent) $parent.find('[data-toggle="collapse"][data-parent="' + parent + '"]').not($this).addClass('collapsed') $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed') } diff --git a/js/dropdown.js b/js/dropdown.js index 6e206a0d1..b35ce562d 100644 --- a/js/dropdown.js +++ b/js/dropdown.js @@ -14,7 +14,7 @@ // ========================= var backdrop = '.dropdown-backdrop' - var toggle = '[data-toggle=dropdown]' + var toggle = '[data-toggle="dropdown"]' var Dropdown = function (element) { $(element).on('click.bs.dropdown', this.toggle) } @@ -69,7 +69,7 @@ } var desc = ' li:not(.divider):visible a' - var $items = $parent.find('[role=menu]' + desc + ', [role=listbox]' + desc) + var $items = $parent.find('[role="menu"]' + desc + ', [role="listbox"]' + desc) if (!$items.length) return @@ -142,6 +142,6 @@ .on('click.bs.dropdown.data-api', clearMenus) .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() }) .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle) - .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu], [role=listbox]', Dropdown.prototype.keydown) + .on('keydown.bs.dropdown.data-api', toggle + ', [role="menu"], [role="listbox"]', Dropdown.prototype.keydown) }(jQuery); -- cgit v1.2.3 From e9cced72fd7b7924d8b2d2a6b4be9247aa567680 Mon Sep 17 00:00:00 2001 From: fat Date: Sat, 8 Mar 2014 19:20:47 -0800 Subject: fix #9342 --- js/affix.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/affix.js b/js/affix.js index 05c909e16..84953c5cd 100644 --- a/js/affix.js +++ b/js/affix.js @@ -66,7 +66,7 @@ offsetTop != null && (scrollTop <= offsetTop) ? 'top' : false if (this.affixed === affix) return - if (this.unpin) this.$element.css('top', '') + if (this.unpin != null) this.$element.css('top', '') var affixType = 'affix' + (affix ? '-' + affix : '') var e = $.Event(affixType + '.bs.affix') -- cgit v1.2.3 From 4d96e69a55a7d5c964d672fe2cf8f89c057bcb57 Mon Sep 17 00:00:00 2001 From: fat Date: Sat, 8 Mar 2014 19:45:38 -0800 Subject: fixes #9836 --- js/collapse.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/collapse.js b/js/collapse.js index 6907dda3a..59e27f13d 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -56,7 +56,8 @@ this.transitioning = 1 - var complete = function () { + var complete = function (e) { + if (e && e.target != this.$element[0]) return this.$element .removeClass('collapsing') .addClass('collapse in') @@ -95,7 +96,8 @@ this.transitioning = 1 - var complete = function () { + var complete = function (e) { + if (e && e.target != this.$element[0]) return this.transitioning = 0 this.$element .trigger('hidden.bs.collapse') -- cgit v1.2.3