diff options
| -rw-r--r-- | Gruntfile.js | 10 | ||||
| -rw-r--r-- | dist/js/bootstrap.js | 26 | ||||
| -rw-r--r-- | docs-assets/js/application.js | 16 | ||||
| -rw-r--r-- | docs-assets/js/customizer.js | 36 | ||||
| -rw-r--r-- | js/.jshintrc | 1 | ||||
| -rw-r--r-- | js/affix.js | 2 | ||||
| -rw-r--r-- | js/alert.js | 2 | ||||
| -rw-r--r-- | js/button.js | 2 | ||||
| -rw-r--r-- | js/carousel.js | 2 | ||||
| -rw-r--r-- | js/collapse.js | 2 | ||||
| -rw-r--r-- | js/dropdown.js | 2 | ||||
| -rw-r--r-- | js/modal.js | 2 | ||||
| -rw-r--r-- | js/popover.js | 2 | ||||
| -rw-r--r-- | js/scrollspy.js | 2 | ||||
| -rw-r--r-- | js/tab.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/affix.js | 10 | ||||
| -rw-r--r-- | js/tests/unit/alert.js | 14 | ||||
| -rw-r--r-- | js/tests/unit/button.js | 20 | ||||
| -rw-r--r-- | js/tests/unit/carousel.js | 34 | ||||
| -rw-r--r-- | js/tests/unit/collapse.js | 24 | ||||
| -rw-r--r-- | js/tests/unit/dropdown.js | 34 | ||||
| -rw-r--r-- | js/tests/unit/modal.js | 152 | ||||
| -rw-r--r-- | js/tests/unit/phantom.js | 16 | ||||
| -rw-r--r-- | js/tests/unit/popover.js | 28 | ||||
| -rw-r--r-- | js/tests/unit/scrollspy.js | 10 | ||||
| -rw-r--r-- | js/tests/unit/tab.js | 32 | ||||
| -rw-r--r-- | js/tests/unit/tooltip.js | 198 | ||||
| -rw-r--r-- | js/tests/unit/transition.js | 6 | ||||
| -rw-r--r-- | js/tooltip.js | 4 | ||||
| -rw-r--r-- | js/transition.js | 2 |
30 files changed, 347 insertions, 346 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index 3eaaacee93..f7da24f8b8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,7 +1,7 @@ /* jshint node: true */ module.exports = function (grunt) { - "use strict"; + 'use strict'; // Force use of Unix newlines grunt.util.linefeed = '\n'; @@ -135,7 +135,7 @@ module.exports = function (grunt) { copy: { fonts: { expand: true, - src: ["fonts/*"], + src: ['fonts/*'], dest: 'dist/' } }, @@ -164,12 +164,12 @@ module.exports = function (grunt) { options: { reset: true, relaxerror: [ - "Bad value X-UA-Compatible for attribute http-equiv on element meta.", - "Element img is missing required attribute src." + 'Bad value X-UA-Compatible for attribute http-equiv on element meta.', + 'Element img is missing required attribute src.' ] }, files: { - src: ["_gh_pages/**/*.html"] + src: ['_gh_pages/**/*.html'] } }, diff --git a/dist/js/bootstrap.js b/dist/js/bootstrap.js index d6b01e8508..dfa3d4e246 100644 --- a/dist/js/bootstrap.js +++ b/dist/js/bootstrap.js @@ -26,7 +26,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) // ============================================================ @@ -83,7 +83,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // ALERT CLASS DEFINITION // ====================== @@ -182,7 +182,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // BUTTON PUBLIC CLASS DEFINITION // ============================== @@ -298,7 +298,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // CAROUSEL CLASS DEFINITION // ========================= @@ -516,7 +516,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // COLLAPSE PUBLIC CLASS DEFINITION // ================================ @@ -696,7 +696,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // DROPDOWN CLASS DEFINITION // ========================= @@ -851,7 +851,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // MODAL CLASS DEFINITION // ====================== @@ -1099,7 +1099,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // TOOLTIP PUBLIC CLASS DEFINITION // =============================== @@ -1324,7 +1324,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" } Tooltip.prototype.replaceArrow = function (delta, dimension, position) { - this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') + this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '') } Tooltip.prototype.setContent = function () { @@ -1485,7 +1485,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // POPOVER PUBLIC CLASS DEFINITION // =============================== @@ -1603,7 +1603,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // SCROLLSPY CLASS DEFINITION // ========================== @@ -1762,7 +1762,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // TAB CLASS DEFINITION // ==================== @@ -1898,7 +1898,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // AFFIX CLASS DEFINITION // ====================== diff --git a/docs-assets/js/application.js b/docs-assets/js/application.js index 1d95de879f..ace8bddfcb 100644 --- a/docs-assets/js/application.js +++ b/docs-assets/js/application.js @@ -18,13 +18,13 @@ // // See Getting Started docs for more information if (navigator.userAgent.match(/IEMobile\/10\.0/)) { - var msViewportStyle = document.createElement("style"); + var msViewportStyle = document.createElement('style'); msViewportStyle.appendChild( document.createTextNode( - "@-ms-viewport{width:auto!important}" + '@-ms-viewport{width:auto!important}' ) ); - document.getElementsByTagName("head")[0]. + document.getElementsByTagName('head')[0]. appendChild(msViewportStyle); } @@ -73,20 +73,20 @@ // tooltip demo $('.tooltip-demo').tooltip({ - selector: "[data-toggle=tooltip]", - container: "body" + selector: '[data-toggle=tooltip]', + container: 'body' }) $('.tooltip-test').tooltip() $('.popover-test').popover() $('.bs-docs-navbar').tooltip({ - selector: "a[data-toggle=tooltip]", - container: ".bs-docs-navbar .nav" + selector: 'a[data-toggle=tooltip]', + container: '.bs-docs-navbar .nav' }) // popover demo - $("[data-toggle=popover]") + $('[data-toggle=popover]') .popover() // button state demo diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index 4d39d21707..d560769c3f 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -35,18 +35,18 @@ window.onload = function () { // wait for load in a dumb way because B-0 } function getQueryParam(key) { - key = key.replace(/[*+?^$.\[\]{}()|\\\/]/g, "\\$&"); // escape RegEx meta chars - var match = location.search.match(new RegExp("[?&]" + key + "=([^&]+)(&|$)")); - return match && decodeURIComponent(match[1].replace(/\+/g, " ")); + key = key.replace(/[*+?^$.\[\]{}()|\\\/]/g, '\\$&'); // escape RegEx meta chars + var match = location.search.match(new RegExp('[?&]' + key + '=([^&]+)(&|$)')); + return match && decodeURIComponent(match[1].replace(/\+/g, ' ')); } function createGist(configJson) { var data = { - "description": "Bootstrap Customizer Config", - "public": true, - "files": { - "config.json": { - "content": configJson + 'description': 'Bootstrap Customizer Config', + 'public': true, + 'files': { + 'config.json': { + 'content': configJson } } } @@ -57,7 +57,7 @@ window.onload = function () { // wait for load in a dumb way because B-0 data: JSON.stringify(data) }) .success(function (result) { - var origin = window.location.protocol + "//" + window.location.host + var origin = window.location.protocol + '//' + window.location.host history.replaceState(false, document.title, origin + window.location.pathname + '?id=' + result.id) }) .error(function (err) { @@ -144,10 +144,10 @@ window.onload = function () { // wait for load in a dumb way because B-0 } if (config) { - zip.file("config.json", config) + zip.file('config.json', config) } - var content = zip.generate({ type: "blob" }) + var content = zip.generate({ type: 'blob' }) complete(content) } @@ -311,22 +311,22 @@ window.onload = function () { // wait for load in a dumb way because B-0 generateZip(generateCSS(), generateJavascript(), generateFonts(), configJson, function (blob) { $compileBtn.removeAttr('disabled') - saveAs(blob, "bootstrap.zip") + saveAs(blob, 'bootstrap.zip') createGist(configJson) }) }) // browser support alerts if (!window.URL && navigator.userAgent.toLowerCase().indexOf('safari') != -1) { - showCallout("Looks like you're using safari, which sadly doesn't have the best support\ - for HTML5 blobs. Because of this your file will be downloaded with the name <code>\"untitled\"</code>.\ - However, if you check your downloads folder, just rename this <code>\"untitled\"</code> file\ - to <code>\"bootstrap.zip\"</code> and you should be good to go!") + showCallout('Looks like you\'re using safari, which sadly doesn\'t have the best support\ + for HTML5 blobs. Because of this your file will be downloaded with the name <code>"untitled"</code>.\ + However, if you check your downloads folder, just rename this <code>"untitled"</code> file\ + to <code>"bootstrap.zip"</code> and you should be good to go!') } else if (!window.URL && !window.webkitURL) { $('.bs-docs-section, .bs-sidebar').css('display', 'none') - showCallout("Looks like your current browser doesn't support the Bootstrap Customizer. Please take a second\ - to <a href=\"https://www.google.com/intl/en/chrome/browser/\"> upgrade to a more modern browser</a>.", true) + showCallout('Looks like your current browser doesn\'t support the Bootstrap Customizer. Please take a second\ + to <a href="https://www.google.com/intl/en/chrome/browser/"> upgrade to a more modern browser</a>.', true) } parseUrl() diff --git a/js/.jshintrc b/js/.jshintrc index fdfdfbbfb3..c8cccda377 100644 --- a/js/.jshintrc +++ b/js/.jshintrc @@ -10,5 +10,6 @@ "expr" : true, "laxbreak" : true, "laxcomma" : true, + "quotmark" : "single", "validthis": true }
\ No newline at end of file diff --git a/js/affix.js b/js/affix.js index 552bffa3fe..0650ce3ae5 100644 --- a/js/affix.js +++ b/js/affix.js @@ -18,7 +18,7 @@ * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // AFFIX CLASS DEFINITION // ====================== diff --git a/js/alert.js b/js/alert.js index 695ad74d02..13a0cab915 100644 --- a/js/alert.js +++ b/js/alert.js @@ -18,7 +18,7 @@ * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // ALERT CLASS DEFINITION // ====================== diff --git a/js/button.js b/js/button.js index c9fdde5e48..6c66960d82 100644 --- a/js/button.js +++ b/js/button.js @@ -18,7 +18,7 @@ * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // BUTTON PUBLIC CLASS DEFINITION // ============================== diff --git a/js/carousel.js b/js/carousel.js index 6391a36df9..26f3832ff4 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -18,7 +18,7 @@ * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // CAROUSEL CLASS DEFINITION // ========================= diff --git a/js/collapse.js b/js/collapse.js index 1a079938e7..7bc9fcb425 100644 --- a/js/collapse.js +++ b/js/collapse.js @@ -18,7 +18,7 @@ * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // COLLAPSE PUBLIC CLASS DEFINITION // ================================ diff --git a/js/dropdown.js b/js/dropdown.js index b84d219bd2..3f71c7569b 100644 --- a/js/dropdown.js +++ b/js/dropdown.js @@ -18,7 +18,7 @@ * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // DROPDOWN CLASS DEFINITION // ========================= diff --git a/js/modal.js b/js/modal.js index 5544cf04e0..15b81c3623 100644 --- a/js/modal.js +++ b/js/modal.js @@ -18,7 +18,7 @@ * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // MODAL CLASS DEFINITION // ====================== diff --git a/js/popover.js b/js/popover.js index 996962aa25..d26d386b67 100644 --- a/js/popover.js +++ b/js/popover.js @@ -18,7 +18,7 @@ * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // POPOVER PUBLIC CLASS DEFINITION // =============================== diff --git a/js/scrollspy.js b/js/scrollspy.js index 2efe14fddf..8c4d13490c 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -18,7 +18,7 @@ * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // SCROLLSPY CLASS DEFINITION // ========================== @@ -18,7 +18,7 @@ * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // TAB CLASS DEFINITION // ==================== diff --git a/js/tests/unit/affix.js b/js/tests/unit/affix.js index b74bc51e48..6085a141e2 100644 --- a/js/tests/unit/affix.js +++ b/js/tests/unit/affix.js @@ -1,22 +1,22 @@ $(function () { - module("affix") + module('affix') - test("should provide no conflict", function () { + 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 () { + test('should be defined on jquery object', function () { ok($(document.body).affix, 'affix method is defined') }) - test("should return element", function () { + 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 () { + test('should exit early if element is not visible', function () { var $affix = $('<div style="display: none"></div>').affix() $affix.data('bs.affix').checkPosition() ok(!$affix.hasClass('affix'), 'affix class was not added') diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js index 98b10059e1..5e39bbab67 100644 --- a/js/tests/unit/alert.js +++ b/js/tests/unit/alert.js @@ -1,22 +1,22 @@ $(function () { - module("alert") + module('alert') - test("should provide no conflict", function () { + 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 () { + test('should be defined on jquery object', function () { ok($(document.body).alert, 'alert method is defined') }) - test("should return element", function () { + test('should return element', function () { ok($(document.body).alert()[0] == document.body, 'document.body returned') }) - test("should fade element out on clicking .close", function () { + test('should fade element out on clicking .close', function () { var alertHTML = '<div class="alert-message warning fade in">' + '<a class="close" href="#" data-dismiss="alert">×</a>' + '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>' @@ -28,7 +28,7 @@ $(function () { ok(!alert.hasClass('in'), 'remove .in class on .close click') }) - test("should remove element when clicking .close", function () { + test('should remove element when clicking .close', function () { $.support.transition = false var alertHTML = '<div class="alert-message warning fade in">' @@ -44,7 +44,7 @@ $(function () { ok(!$('#qunit-fixture').find('.alert-message').length, 'element removed from dom') }) - test("should not fire closed when close is prevented", function () { + test('should not fire closed when close is prevented', function () { $.support.transition = false stop(); $('<div class="alert"/>') diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js index 115edefafd..45397aeffb 100644 --- a/js/tests/unit/button.js +++ b/js/tests/unit/button.js @@ -1,22 +1,22 @@ $(function () { - module("button") + module('button') - test("should provide no conflict", function () { + 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 () { + test('should be defined on jquery object', function () { ok($(document.body).button, 'button method is defined') }) - test("should return element", function () { + test('should return element', function () { ok($(document.body).button()[0] == document.body, 'document.body returned') }) - test("should return set state to loading", function () { + test('should return set state to loading', function () { var btn = $('<button class="btn" data-loading-text="fat">mdo</button>') equal(btn.html(), 'mdo', 'btn text equals mdo') btn.button('loading') @@ -29,7 +29,7 @@ $(function () { }, 0) }) - test("should return reset state", function () { + test('should return reset state', function () { var btn = $('<button class="btn" data-loading-text="fat">mdo</button>') equal(btn.html(), 'mdo', 'btn text equals mdo') btn.button('loading') @@ -51,14 +51,14 @@ $(function () { }) - test("should toggle active", function () { + test('should toggle active', function () { var btn = $('<button class="btn">mdo</button>') 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 () { + test('should toggle active when btn children are clicked', function () { var btn = $('<button class="btn" data-toggle="button">mdo</button>') , inner = $('<i></i>') btn @@ -69,7 +69,7 @@ $(function () { ok(btn.hasClass('active'), 'btn has class active') }) - test("should toggle active when btn children are clicked within btn-group", function () { + test('should toggle active when btn children are clicked within btn-group', function () { var btngroup = $('<div class="btn-group" data-toggle="buttons"></div>') , btn = $('<button class="btn">fat</button>') , inner = $('<i></i>') @@ -81,7 +81,7 @@ $(function () { ok(btn.hasClass('active'), 'btn has class active') }) - test("should check for closest matching toggle", function () { + test('should check for closest matching toggle', function () { var group = '<div class="btn-group" data-toggle="buttons">' + '<label class="btn btn-primary active">' + '<input type="radio" name="options" id="option1" checked="true"> Option 1' + diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js index badf0886d3..8d1726b717 100644 --- a/js/tests/unit/carousel.js +++ b/js/tests/unit/carousel.js @@ -1,22 +1,22 @@ $(function () { - module("carousel") + module('carousel') - test("should provide no conflict", function () { + 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 () { + test('should be defined on jquery object', function () { ok($(document.body).carousel, 'carousel method is defined') }) - test("should return element", function () { + test('should return element', function () { ok($(document.body).carousel()[0] == document.body, 'document.body returned') }) - test("should not fire sliden when slide is prevented", function () { + test('should not fire sliden when slide is prevented', function () { $.support.transition = false stop() $('<div class="carousel"/>') @@ -31,7 +31,7 @@ $(function () { .carousel('next') }) - test("should fire slide event with direction", function () { + test('should fire slide event with direction', function () { var template = '<div id="myCarousel" class="carousel slide"><div class="carousel-inner"><div class="item active"><img alt=""><div class="carousel-caption"><h4>{{_i}}First Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div><div class="item"><img alt=""><div class="carousel-caption"><h4>{{_i}}Second Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div><div class="item"><img alt=""><div class="carousel-caption"><h4>{{_i}}Third Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div></div><a class="left carousel-control" href="#myCarousel" data-slide="prev">‹</a><a class="right carousel-control" href="#myCarousel" data-slide="next">›</a></div>' $.support.transition = false stop() @@ -43,7 +43,7 @@ $(function () { }).carousel('next') }) - test("should fire slide event with relatedTarget", function () { + test('should fire slide event with relatedTarget', function () { var template = '<div id="myCarousel" class="carousel slide"><div class="carousel-inner"><div class="item active"><img alt=""><div class="carousel-caption"><h4>{{_i}}First Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div><div class="item"><img alt=""><div class="carousel-caption"><h4>{{_i}}Second Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div><div class="item"><img alt=""><div class="carousel-caption"><h4>{{_i}}Third Thumbnail label{{/i}}</h4><p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p></div></div></div><a class="left carousel-control" href="#myCarousel" data-slide="prev">‹</a><a class="right carousel-control" href="#myCarousel" data-slide="next">›</a></div>' $.support.transition = false stop() @@ -57,31 +57,31 @@ $(function () { .carousel('next') }) - test("should set interval from data attribute", 4, function () { + test('should set interval from data attribute', 4, function () { var template = $('<div id="myCarousel" class="carousel slide"> <div class="carousel-inner"> <div class="item active"> <img alt=""> <div class="carousel-caption"> <h4>{{_i}}First Thumbnail label{{/i}}</h4> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> </div> </div> <div class="item"> <img alt=""> <div class="carousel-caption"> <h4>{{_i}}Second Thumbnail label{{/i}}</h4> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> </div> </div> <div class="item"> <img alt=""> <div class="carousel-caption"> <h4>{{_i}}Third Thumbnail label{{/i}}</h4> <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> </div> </div> </div> <a class="left carousel-control" href="#myCarousel" data-slide="prev">‹</a> <a class="right carousel-control" href="#myCarousel" data-slide="next">›</a> </div>'); - template.attr("data-interval", 1814); + template.attr('data-interval', 1814); - template.appendTo("body"); + template.appendTo('body'); $('[data-slide]').first().click(); ok($('#myCarousel').data('bs.carousel').options.interval == 1814); $('#myCarousel').remove(); - template.appendTo("body").attr("data-modal", "foobar"); + template.appendTo('body').attr('data-modal', 'foobar'); $('[data-slide]').first().click(); - ok($('#myCarousel').data('bs.carousel').options.interval == 1814, "even if there is an data-modal attribute set"); + ok($('#myCarousel').data('bs.carousel').options.interval == 1814, 'even if there is an data-modal attribute set'); $('#myCarousel').remove(); - template.appendTo("body"); + template.appendTo('body'); $('[data-slide]').first().click(); $('#myCarousel').attr('data-interval', 1860); $('[data-slide]').first().click(); - ok($('#myCarousel').data('bs.carousel').options.interval == 1814, "attributes should be read only on intitialization"); + ok($('#myCarousel').data('bs.carousel').options.interval == 1814, 'attributes should be read only on intitialization'); $('#myCarousel').remove(); - template.attr("data-interval", false); - template.appendTo("body"); + 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"); + 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 11b2cf8383..10d5aeda6f 100644 --- a/js/tests/unit/collapse.js +++ b/js/tests/unit/collapse.js @@ -1,34 +1,34 @@ $(function () { - module("collapse") + module('collapse') - test("should provide no conflict", function () { + 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 () { + test('should be defined on jquery object', function () { ok($(document.body).collapse, 'collapse method is defined') }) - test("should return element", function () { + test('should return element', function () { ok($(document.body).collapse()[0] == document.body, 'document.body returned') }) - test("should show a collapsed element", function () { + test('should show a collapsed element', function () { var el = $('<div class="collapse"></div>').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 () { + test('should hide a collapsed element', function () { var el = $('<div class="collapse"></div>').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 () { + test('should not fire shown when show is prevented', function () { $.support.transition = false stop() $('<div class="collapse"/>') @@ -43,7 +43,7 @@ $(function () { .collapse('show') }) - test("should reset style to auto after finishing opening collapse", function () { + test('should reset style to auto after finishing opening collapse', function () { $.support.transition = false stop() $('<div class="collapse" style="height: 0px"/>') @@ -57,7 +57,7 @@ $(function () { .collapse('show') }) - test("should add active class to target when collapse shown", function () { + test('should add active class to target when collapse shown', function () { $.support.transition = false stop() @@ -74,7 +74,7 @@ $(function () { target.click() }) - test("should remove active class to target when collapse hidden", function () { + test('should remove active class to target when collapse hidden', function () { $.support.transition = false stop() @@ -91,7 +91,7 @@ $(function () { target.click() }) - test("should remove active class from inactive accordion targets", function () { + test('should remove active class from inactive accordion targets', function () { $.support.transition = false stop() @@ -126,7 +126,7 @@ $(function () { target3.click() }) - test("should allow dots in data-parent", function () { + test('should allow dots in data-parent', function () { $.support.transition = false stop() diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js index 02256965d5..c94cf4fca4 100644 --- a/js/tests/unit/dropdown.js +++ b/js/tests/unit/dropdown.js @@ -1,23 +1,23 @@ $(function () { - module("dropdowns") + module('dropdowns') - test("should provide no conflict", function () { + 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 () { + test('should be defined on jquery object', function () { ok($(document.body).dropdown, 'dropdown method is defined') }) - test("should return element", function () { - var el = $("<div />") + test('should return element', function () { + var el = $('<div />') ok(el.dropdown()[0] === el[0], 'same element returned') }) - test("should not open dropdown if target is disabled", function () { + test('should not open dropdown if target is disabled', function () { var dropdownHTML = '<ul class="tabs">' + '<li class="dropdown">' + '<button disabled href="#" class="btn dropdown-toggle" data-toggle="dropdown">Dropdown</button>' @@ -34,7 +34,7 @@ $(function () { ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') }) - test("should not open dropdown if target is disabled", function () { + test('should not open dropdown if target is disabled', function () { var dropdownHTML = '<ul class="tabs">' + '<li class="dropdown">' + '<button href="#" class="btn dropdown-toggle disabled" data-toggle="dropdown">Dropdown</button>' @@ -51,7 +51,7 @@ $(function () { ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click') }) - test("should add class open to menu if clicked", function () { + test('should add class open to menu if clicked', function () { var dropdownHTML = '<ul class="tabs">' + '<li class="dropdown">' + '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' @@ -68,7 +68,7 @@ $(function () { 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 () { + test('should test if element has a # before assuming it\'s a selector', function () { var dropdownHTML = '<ul class="tabs">' + '<li class="dropdown">' + '<a href="/foo/" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' @@ -86,7 +86,7 @@ $(function () { }) - test("should remove open class if body clicked", function () { + test('should remove open class if body clicked', function () { var dropdownHTML = '<ul class="tabs">' + '<li class="dropdown">' + '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' @@ -110,7 +110,7 @@ $(function () { dropdown.remove() }) - test("should remove open class if body clicked, with multiple drop downs", function () { + test('should remove open class if body clicked, with multiple drop downs', function () { var dropdownHTML = '<ul class="nav">' + ' <li><a href="#menu1">Menu 1</a></li>' @@ -132,24 +132,24 @@ $(function () { , first = dropdowns.first() , last = dropdowns.last() - ok(dropdowns.length == 2, "Should be two dropdowns") + 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') + 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') + ok($('#qunit-fixture .open').length === 0, 'open class removed') - $("#qunit-fixture").html("") + $('#qunit-fixture').html('') }) - test("should fire show and hide event", function () { + test('should fire show and hide event', function () { var dropdownHTML = '<ul class="tabs">' + '<li class="dropdown">' + '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' @@ -183,7 +183,7 @@ $(function () { }) - test("should fire shown and hiden event", function () { + test('should fire shown and hiden event', function () { var dropdownHTML = '<ul class="tabs">' + '<li class="dropdown">' + '<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>' diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js index a6dade99bf..6b20743273 100644 --- a/js/tests/unit/modal.js +++ b/js/tests/unit/modal.js @@ -1,195 +1,195 @@ $(function () { - module("modal") + module('modal') - test("should provide no conflict", function () { + 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 = $("<div id='modal-test'></div>") + test('should be defined on jquery object', function () { + var div = $('<div id="modal-test"></div>') ok(div.modal, 'modal method is defined') }) - test("should return element", function () { - var div = $("<div id='modal-test'></div>") + test('should return element', function () { + var div = $('<div id="modal-test"></div>') ok(div.modal() == div, 'document.body returned') $('#modal-test').remove() }) - test("should expose defaults var for settings", function () { + 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 () { + test('should insert into dom when show method is called', function () { stop() $.support.transition = false - $("<div id='modal-test'></div>") - .on("shown.bs.modal", function () { + $('<div id="modal-test"></div>') + .on('shown.bs.modal', function () { ok($('#modal-test').length, 'modal inserted into dom') $(this).remove() start() }) - .modal("show") + .modal('show') }) - test("should fire show event", function () { + test('should fire show event', function () { stop() $.support.transition = false - $("<div id='modal-test'></div>") - .on("show.bs.modal", function () { - ok(true, "show was called") + $('<div id="modal-test"></div>') + .on('show.bs.modal', function () { + ok(true, 'show was called') }) - .on("shown.bs.modal", function () { + .on('shown.bs.modal', function () { $(this).remove() start() }) - .modal("show") + .modal('show') }) - test("should not fire shown when default prevented", function () { + test('should not fire shown when default prevented', function () { stop() $.support.transition = false - $("<div id='modal-test'></div>") - .on("show.bs.modal", function (e) { + $('<div id="modal-test"></div>') + .on('show.bs.modal', function (e) { e.preventDefault() - ok(true, "show was called") + ok(true, 'show was called') start() }) - .on("shown.bs.modal", function () { - ok(false, "shown was called") + .on('shown.bs.modal', function () { + ok(false, 'shown was called') }) - .modal("show") + .modal('show') }) - test("should hide modal when hide is called", function () { + test('should hide modal when hide is called', function () { stop() $.support.transition = false - $("<div id='modal-test'></div>") - .on("shown.bs.modal", function () { - ok($('#modal-test').is(":visible"), 'modal visible') + $('<div id="modal-test"></div>') + .on('shown.bs.modal', function () { + ok($('#modal-test').is(':visible'), 'modal visible') ok($('#modal-test').length, 'modal inserted into dom') - $(this).modal("hide") + $(this).modal('hide') }) - .on("hidden.bs.modal", function () { - ok(!$('#modal-test').is(":visible"), 'modal hidden') + .on('hidden.bs.modal', function () { + ok(!$('#modal-test').is(':visible'), 'modal hidden') $('#modal-test').remove() start() }) - .modal("show") + .modal('show') }) - test("should toggle when toggle is called", function () { + test('should toggle when toggle is called', function () { stop() $.support.transition = false - var div = $("<div id='modal-test'></div>") + var div = $('<div id="modal-test"></div>') div - .on("shown.bs.modal", function () { - ok($('#modal-test').is(":visible"), 'modal visible') + .on('shown.bs.modal', function () { + ok($('#modal-test').is(':visible'), 'modal visible') ok($('#modal-test').length, 'modal inserted into dom') - div.modal("toggle") + div.modal('toggle') }) - .on("hidden.bs.modal", function () { - ok(!$('#modal-test').is(":visible"), 'modal hidden') + .on('hidden.bs.modal', function () { + ok(!$('#modal-test').is(':visible'), 'modal hidden') div.remove() start() }) - .modal("toggle") + .modal('toggle') }) - test("should remove from dom when click [data-dismiss=modal]", function () { + test('should remove from dom when click [data-dismiss=modal]', function () { stop() $.support.transition = false - var div = $("<div id='modal-test'><span class='close' data-dismiss='modal'></span></div>") + var div = $('<div id="modal-test"><span class="close" data-dismiss="modal"></span></div>') div - .on("shown.bs.modal", function () { - ok($('#modal-test').is(":visible"), 'modal visible') + .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') + .on('hidden.bs.modal', function () { + ok(!$('#modal-test').is(':visible'), 'modal hidden') div.remove() start() }) - .modal("toggle") + .modal('toggle') }) - test("should allow modal close with 'backdrop:false'", function () { + test('should allow modal close with "backdrop:false"', function () { stop() $.support.transition = false - var div = $("<div>", { id: 'modal-test', "data-backdrop": false }) + var div = $('<div>', { id: 'modal-test', 'data-backdrop': false }) div - .on("shown.bs.modal", function () { - ok($('#modal-test').is(":visible"), 'modal visible') - div.modal("hide") + .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') + .on('hidden.bs.modal', function () { + ok(!$('#modal-test').is(':visible'), 'modal hidden') div.remove() start() }) - .modal("show") + .modal('show') }) - test("should close modal when clicking outside of modal-content", function () { + test('should close modal when clicking outside of modal-content', function () { stop() $.support.transition = false - var div = $("<div id='modal-test'><div class='contents'></div></div>") + var div = $('<div id="modal-test"><div class="contents"></div></div>') div - .bind("shown.bs.modal", function () { + .bind('shown.bs.modal', function () { ok($('#modal-test').length, 'modal insterted into dom') $('.contents').click() - ok($('#modal-test').is(":visible"), 'modal visible') + ok($('#modal-test').is(':visible'), 'modal visible') $('#modal-test').click() }) - .bind("hidden.bs.modal", function () { - ok(!$('#modal-test').is(":visible"), 'modal hidden') + .bind('hidden.bs.modal', function () { + ok(!$('#modal-test').is(':visible'), 'modal hidden') div.remove() start() }) - .modal("show") + .modal('show') }) - test("should trigger hide event once when clicking outside of modal-content", function () { + test('should trigger hide event once when clicking outside of modal-content', function () { stop() $.support.transition = false - var div = $("<div id='modal-test'><div class='contents'></div></div>") + var div = $('<div id="modal-test"><div class="contents"></div></div>') var triggered div - .bind("shown.bs.modal", function () { + .bind('shown.bs.modal', function () { triggered = 0 $('#modal-test').click() }) - .one("hidden.bs.modal", function () { - div.modal("show") + .one('hidden.bs.modal', function () { + div.modal('show') }) - .bind("hide.bs.modal", function () { + .bind('hide.bs.modal', function () { triggered += 1 ok(triggered === 1, 'modal hide triggered once') start() }) - .modal("show") + .modal('show') }) - test("should close reopened modal with [data-dismiss=modal] click", function () { + test('should close reopened modal with [data-dismiss=modal] click', function () { stop() $.support.transition = false - var div = $("<div id='modal-test'><div class='contents'><div id='close' data-dismiss='modal'></div></div></div>") + var div = $('<div id="modal-test"><div class="contents"><div id="close" data-dismiss="modal"></div></div></div>') div - .bind("shown.bs.modal", function () { + .bind('shown.bs.modal', function () { $('#close').click() - ok(!$('#modal-test').is(":visible"), 'modal hidden') + ok(!$('#modal-test').is(':visible'), 'modal hidden') }) - .one("hidden.bs.modal", function () { + .one('hidden.bs.modal', function () { div.one('hidden.bs.modal', function () { start() - }).modal("show") + }).modal('show') }) - .modal("show") + .modal('show') div.remove() }) diff --git a/js/tests/unit/phantom.js b/js/tests/unit/phantom.js index cf9da25375..bf480ecaaa 100644 --- a/js/tests/unit/phantom.js +++ b/js/tests/unit/phantom.js @@ -2,7 +2,7 @@ * grunt-contrib-qunit * http://gruntjs.com/ * - * Copyright (c) 2013 "Cowboy" Ben Alman, contributors + * Copyright (c) 2013 'Cowboy' Ben Alman, contributors * Licensed under the MIT license. */ @@ -46,23 +46,23 @@ QUnit.begin = function () { sendMessage('qunit.begin') - console.log("Starting test suite") - console.log("================================================\n") + console.log('Starting test suite') + console.log('================================================\n') } QUnit.moduleDone = function (opts) { if (opts.failed === 0) { - console.log("\r\u2714 All tests passed in '" + opts.name + "' module") + console.log('\r\u2714 All tests passed in "' + opts.name + '" module') } else { - console.log("\u2716 " + opts.failed + " tests failed in '" + opts.name + "' module") + console.log('\u2716 ' + opts.failed + ' tests failed in "' + opts.name + '" module') } sendMessage('qunit.moduleDone', opts.name, opts.failed, opts.passed, opts.total) } QUnit.done = function (opts) { - console.log("\n================================================") - console.log("Tests completed in " + opts.runtime + " milliseconds") - console.log(opts.passed + " tests of " + opts.total + " passed, " + opts.failed + " failed.") + console.log('\n================================================') + console.log('Tests completed in ' + opts.runtime + ' milliseconds') + console.log(opts.passed + ' tests of ' + opts.total + ' passed, ' + opts.failed + ' failed.') sendMessage('qunit.done', opts.failed, opts.passed, opts.total, opts.runtime) } diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js index 2a11e0fdfc..5ed4252beb 100644 --- a/js/tests/unit/popover.js +++ b/js/tests/unit/popover.js @@ -1,24 +1,24 @@ $(function () { - module("popover") + module('popover') - test("should provide no conflict", function () { + 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 () { + test('should be defined on jquery object', function () { var div = $('<div></div>') ok(div.popover, 'popover method is defined') }) - test("should return element", function () { + test('should return element', function () { var div = $('<div></div>') ok(div.popover() == div, 'document.body returned') }) - test("should render popover element", function () { + test('should render popover element', function () { $.support.transition = false var popover = $('<a href="#" title="mdo" data-content="http://twitter.com/mdo">@mdo</a>') .appendTo('#qunit-fixture') @@ -26,10 +26,10 @@ $(function () { ok($('.popover').length, 'popover was inserted') popover.popover('hide') - ok(!$(".popover").length, 'popover removed') + ok(!$('.popover').length, 'popover removed') }) - test("should store popover instance in popover data object", function () { + test('should store popover instance in popover data object', function () { $.support.transition = false var popover = $('<a href="#" title="mdo" data-content="http://twitter.com/mdo">@mdo</a>') .popover() @@ -37,7 +37,7 @@ $(function () { ok(!!popover.data('bs.popover'), 'popover instance exists') }) - test("should get title and content from options", function () { + test('should get title and content from options', function () { $.support.transition = false var popover = $('<a href="#">@fat</a>') .appendTo('#qunit-fixture') @@ -61,7 +61,7 @@ $(function () { $('#qunit-fixture').empty() }) - test("should get title and content from attributes", function () { + test('should get title and content from attributes', function () { $.support.transition = false var popover = $('<a href="#" title="@mdo" data-content="loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻" >@mdo</a>') .appendTo('#qunit-fixture') @@ -70,7 +70,7 @@ $(function () { 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') + equal($('.popover .popover-content').text(), 'loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻', 'content correctly inserted') popover.popover('hide') ok(!$('.popover').length, 'popover was removed') @@ -78,7 +78,7 @@ $(function () { }) - test("should get title and content from attributes #2", function () { + test('should get title and content from attributes #2', function () { $.support.transition = false var popover = $('<a href="#" title="@mdo" data-content="loves data attributes (づ｡◕‿‿◕｡)づ ︵ ┻━┻" >@mdo</a>') .appendTo('#qunit-fixture') @@ -90,14 +90,14 @@ $(function () { 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') + 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 () { + test('should respect custom classes', function () { $.support.transition = false var popover = $('<a href="#">@fat</a>') .appendTo('#qunit-fixture') @@ -117,7 +117,7 @@ $(function () { $('#qunit-fixture').empty() }) - test("should destroy popover", function () { + test('should destroy popover', function () { var popover = $('<div/>').popover({trigger: 'hover'}).on('click.foo', function () {}) ok(popover.data('bs.popover'), 'popover has data') ok($._data(popover[0], 'events').mouseover && $._data(popover[0], 'events').mouseout, 'popover has hover event') diff --git a/js/tests/unit/scrollspy.js b/js/tests/unit/scrollspy.js index 1b546a5799..8ebf3dcdf5 100644 --- a/js/tests/unit/scrollspy.js +++ b/js/tests/unit/scrollspy.js @@ -1,22 +1,22 @@ $(function () { - module("scrollspy") + module('scrollspy') - test("should provide no conflict", function () { + 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 () { + test('should be defined on jquery object', function () { ok($(document.body).scrollspy, 'scrollspy method is defined') }) - test("should return element", function () { + test('should return element', function () { ok($(document.body).scrollspy()[0] == document.body, 'document.body returned') }) - test("should switch active class on scroll", function () { + test('should switch active class on scroll', function () { var sectionHTML = '<div id="masthead"></div>' , $section = $(sectionHTML).append('#qunit-fixture') , topbarHTML = '<div class="topbar">' diff --git a/js/tests/unit/tab.js b/js/tests/unit/tab.js index 8122628129..6da7dc9a44 100644 --- a/js/tests/unit/tab.js +++ b/js/tests/unit/tab.js @@ -1,55 +1,55 @@ $(function () { - module("tabs") + module('tabs') - test("should provide no conflict", function () { + 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 () { + test('should be defined on jquery object', function () { ok($(document.body).tab, 'tabs method is defined') }) - test("should return element", function () { + test('should return element', function () { ok($(document.body).tab()[0] == document.body, 'document.body returned') }) - test("should activate element by tab id", function () { + test('should activate element by tab id', function () { var tabsHTML = '<ul class="tabs">' + '<li><a href="#home">Home</a></li>' + '<li><a href="#profile">Profile</a></li>' + '</ul>' - $('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo("#qunit-fixture") + $('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo('#qunit-fixture') $(tabsHTML).find('li:last a').tab('show') - equal($("#qunit-fixture").find('.active').attr('id'), "profile") + equal($('#qunit-fixture').find('.active').attr('id'), 'profile') $(tabsHTML).find('li:first a').tab('show') - equal($("#qunit-fixture").find('.active').attr('id'), "home") + equal($('#qunit-fixture').find('.active').attr('id'), 'home') }) - test("should activate element by tab id", function () { + test('should activate element by tab id', function () { var pillsHTML = '<ul class="pills">' + '<li><a href="#home">Home</a></li>' + '<li><a href="#profile">Profile</a></li>' + '</ul>' - $('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo("#qunit-fixture") + $('<ul><li id="home"></li><li id="profile"></li></ul>').appendTo('#qunit-fixture') $(pillsHTML).find('li:last a').tab('show') - equal($("#qunit-fixture").find('.active').attr('id'), "profile") + equal($('#qunit-fixture').find('.active').attr('id'), 'profile') $(pillsHTML).find('li:first a').tab('show') - equal($("#qunit-fixture").find('.active').attr('id'), "home") + equal($('#qunit-fixture').find('.active').attr('id'), 'home') }) - test("should not fire closed when close is prevented", function () { + test('should not fire closed when close is prevented', function () { $.support.transition = false stop(); $('<div class="tab"/>') @@ -64,7 +64,7 @@ $(function () { .tab('show') }) - test("show and shown events should reference correct relatedTarget", function () { + test('show and shown events should reference correct relatedTarget', function () { var dropHTML = '<ul class="drop">' + '<li class="dropdown"><a data-toggle="dropdown" href="#">1</a>' @@ -77,9 +77,9 @@ $(function () { $(dropHTML).find('ul>li:first a').tab('show').end() .find('ul>li:last a').on('show', function (event) { - equal(event.relatedTarget.hash, "#1-1") + equal(event.relatedTarget.hash, '#1-1') }).on('shown', function (event) { - equal(event.relatedTarget.hash, "#1-1") + equal(event.relatedTarget.hash, '#1-1') }).tab('show') }) diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index cc559ccb61..dbfeacb822 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -1,49 +1,49 @@ $(function () { - module("tooltip") + module('tooltip') - test("should provide no conflict", function () { + 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 = $("<div></div>") + test('should be defined on jquery object', function () { + var div = $('<div></div>') ok(div.tooltip, 'popover method is defined') }) - test("should return element", function () { - var div = $("<div></div>") + test('should return element', function () { + var div = $('<div></div>') ok(div.tooltip() == div, 'document.body returned') }) - test("should expose default settings", function () { + test('should expose default settings', function () { ok(!!$.fn.tooltip.Constructor.DEFAULTS, 'defaults is defined') }) - test("should empty title attribute", function () { + test('should empty title attribute', function () { var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>').tooltip() ok(tooltip.attr('title') === '', 'title attribute was emptied') }) - test("should add data attribute for referencing original title", function () { + test('should add data attribute for referencing original title', function () { var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>').tooltip() equal(tooltip.attr('data-original-title'), 'Another tooltip', 'original title preserved in data attribute') }) - test("should place tooltips relative to placement option", function () { + test('should place tooltips relative to placement option', function () { $.support.transition = false var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>') .appendTo('#qunit-fixture') .tooltip({placement: 'bottom'}) .tooltip('show') - ok($(".tooltip").is('.fade.bottom.in'), 'has correct classes applied') + ok($('.tooltip').is('.fade.bottom.in'), 'has correct classes applied') tooltip.tooltip('hide') }) - test("should allow html entities", function () { + test('should allow html entities', function () { $.support.transition = false var tooltip = $('<a href="#" rel="tooltip" title="<b>@fat</b>"></a>') .appendTo('#qunit-fixture') @@ -52,10 +52,10 @@ $(function () { ok($('.tooltip b').length, 'b tag was inserted') tooltip.tooltip('hide') - ok(!$(".tooltip").length, 'tooltip removed') + ok(!$('.tooltip').length, 'tooltip removed') }) - test("should respect custom classes", function () { + test('should respect custom classes', function () { var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>') .appendTo('#qunit-fixture') .tooltip({ template: '<div class="tooltip some-class"><div class="tooltip-arrow"/><div class="tooltip-inner"/></div>'}) @@ -63,87 +63,87 @@ $(function () { ok($('.tooltip').hasClass('some-class'), 'custom class is present') tooltip.tooltip('hide') - ok(!$(".tooltip").length, 'tooltip removed') + ok(!$('.tooltip').length, 'tooltip removed') }) - test("should fire show event", function () { + test('should fire show event', function () { stop() var tooltip = $('<div title="tooltip title"></div>') - .on("show.bs.tooltip", function () { - ok(true, "show was called") + .on('show.bs.tooltip', function () { + ok(true, 'show was called') start() }) .tooltip('show') }) - test("should fire shown event", function () { + test('should fire shown event', function () { stop() var tooltip = $('<div title="tooltip title"></div>') - .on("shown.bs.tooltip", function () { - ok(true, "shown was called") + .on('shown.bs.tooltip', function () { + ok(true, 'shown was called') start() }) .tooltip('show') }) - test("should not fire shown event when default prevented", function () { + test('should not fire shown event when default prevented', function () { stop() var tooltip = $('<div title="tooltip title"></div>') - .on("show.bs.tooltip", function (e) { + .on('show.bs.tooltip', function (e) { e.preventDefault() - ok(true, "show was called") + ok(true, 'show was called') start() }) - .on("shown.bs.tooltip", function () { - ok(false, "shown was called") + .on('shown.bs.tooltip', function () { + ok(false, 'shown was called') }) .tooltip('show') }) - test("should fire hide event", function () { + test('should fire hide event', function () { stop() var tooltip = $('<div title="tooltip title"></div>') - .on("shown.bs.tooltip", function () { + .on('shown.bs.tooltip', function () { $(this).tooltip('hide') }) - .on("hide.bs.tooltip", function () { - ok(true, "hide was called") + .on('hide.bs.tooltip', function () { + ok(true, 'hide was called') start() }) .tooltip('show') }) - test("should fire hidden event", function () { + test('should fire hidden event', function () { stop() var tooltip = $('<div title="tooltip title"></div>') - .on("shown.bs.tooltip", function () { + .on('shown.bs.tooltip', function () { $(this).tooltip('hide') }) - .on("hidden.bs.tooltip", function () { - ok(true, "hidden was called") + .on('hidden.bs.tooltip', function () { + ok(true, 'hidden was called') start() }) .tooltip('show') }) - test("should not fire hidden event when default prevented", function () { + test('should not fire hidden event when default prevented', function () { stop() var tooltip = $('<div title="tooltip title"></div>') - .on("shown.bs.tooltip", function () { + .on('shown.bs.tooltip', function () { $(this).tooltip('hide') }) - .on("hide.bs.tooltip", function (e) { + .on('hide.bs.tooltip', function (e) { e.preventDefault() - ok(true, "hide was called") + ok(true, 'hide was called') start() }) - .on("hidden.bs.tooltip", function () { - ok(false, "hidden was called") + .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 () { + test('should not show tooltip if leave event occurs before delay expires', function () { var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>') .appendTo('#qunit-fixture') .tooltip({ delay: 200 }) @@ -153,16 +153,16 @@ $(function () { tooltip.trigger('mouseenter') setTimeout(function () { - ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in') + 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') + 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 () { + test('should not show tooltip if leave event occurs before delay expires, even if hide delay is 0', function () { var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>') .appendTo('#qunit-fixture') .tooltip({ delay: { show: 200, hide: 0} }) @@ -172,16 +172,16 @@ $(function () { tooltip.trigger('mouseenter') setTimeout(function () { - ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in') + 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') + ok(!$('.tooltip').is('.fade.in'), 'tooltip is not faded in') start() }, 200) }, 100) }) - test("should wait 200 ms before hiding the tooltip", 3, function () { + test('should wait 200 ms before hiding the tooltip', 3, function () { var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>') .appendTo('#qunit-fixture') .tooltip({ delay: { show: 0, hide: 200} }) @@ -191,19 +191,19 @@ $(function () { tooltip.trigger('mouseenter') setTimeout(function () { - ok($(".tooltip").is('.fade.in'), 'tooltip is faded in') + 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') + ok($('.tooltip').is('.fade.in'), '100ms:tooltip is still faded in') setTimeout(function () { - ok(!$(".tooltip").is('.in'), 'tooltip removed') + 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 () { + test('should not hide tooltip if leave event occurs, then tooltip is show immediately again', function () { var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>') .appendTo('#qunit-fixture') .tooltip({ delay: { show: 0, hide: 200} }) @@ -213,51 +213,51 @@ $(function () { tooltip.trigger('mouseenter') setTimeout(function () { - ok($(".tooltip").is('.fade.in'), 'tooltip is faded in') + 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') + ok($('.tooltip').is('.fade.in'), '100ms:tooltip is still faded in') tooltip.trigger('mouseenter') setTimeout(function () { - ok($(".tooltip").is('.in'), 'tooltip removed') + ok($('.tooltip').is('.in'), 'tooltip removed') start() }, 150) }, 100) }, 1) }) - test("should not show tooltip if leave event occurs before delay expires", function () { + test('should not show tooltip if leave event occurs before delay expires', function () { var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>') .appendTo('#qunit-fixture') .tooltip({ delay: 100 }) stop() tooltip.trigger('mouseenter') setTimeout(function () { - ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in') + 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') + 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 () { + test('should show tooltip if leave event hasn\'t occured before delay expires', function () { var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>') .appendTo('#qunit-fixture') .tooltip({ delay: 150 }) stop() tooltip.trigger('mouseenter') setTimeout(function () { - ok(!$(".tooltip").is('.fade.in'), 'tooltip is not faded in') + 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('.fade.in'), 'tooltip has faded in') start() }, 200) }) - test("should destroy tooltip", function () { + test('should destroy tooltip', function () { var tooltip = $('<div/>').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') @@ -270,66 +270,66 @@ $(function () { 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 () { + test('should show tooltip with delegate selector on click', function () { var div = $('<div><a href="#" rel="tooltip" title="Another tooltip"></a></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') + ok($('.tooltip').is('.fade.in'), 'tooltip is faded in') }) - test("should show tooltip when toggle is called", function () { + test('should show tooltip when toggle is called', function () { var tooltip = $('<a href="#" rel="tooltip" title="tooltip on toggle"></a>') .appendTo('#qunit-fixture') .tooltip({trigger: 'manual'}) .tooltip('toggle') - ok($(".tooltip").is('.fade.in'), 'tooltip should be toggled in') + ok($('.tooltip').is('.fade.in'), 'tooltip should be toggled in') }) - test("should place tooltips inside the body", function () { + test('should place tooltips inside the body', function () { var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>') .appendTo('#qunit-fixture') .tooltip({container: 'body'}) .tooltip('show') - ok($("body > .tooltip").length, 'inside the body') - ok(!$("#qunit-fixture > .tooltip").length, 'not found in parent') + 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 = $("<div />").appendTo("body") - .css({position: "absolute", width: 200, height: 200, bottom: 0, left: 0}) - , tooltip = $("<a href='#' title='Very very very very very very very very long tooltip'>Hover me</a>") - .css({position: "absolute", top: 0, left: 0}) + test('should place tooltip inside window', function () { + var container = $('<div />').appendTo('body') + .css({position: 'absolute', width: 200, height: 200, bottom: 0, left: 0}) + , tooltip = $('<a href="#" title="Very very very very very very very very long tooltip">Hover me</a>') + .css({position: 'absolute', top: 0, left: 0}) .appendTo(container) - .tooltip({placement: "top", animate: false}) - .tooltip("show") + .tooltip({placement: 'top', animate: false}) + .tooltip('show') stop() setTimeout(function () { - ok($(".tooltip").offset().left >= 0) + ok($('.tooltip').offset().left >= 0) start() container.remove() }, 100) }) - test("should place tooltip on top of element", function () { - var container = $("<div />").appendTo("body") - .css({position: "absolute", bottom: 0, left: 0, textAlign: "right", width: 300, height: 300}) - , p = $("<p style='margin-top:200px' />").appendTo(container) - , tooltiped = $("<a href='#' title='very very very very very very very long tooltip'>Hover me</a>") + test('should place tooltip on top of element', function () { + var container = $('<div />').appendTo('body') + .css({position: 'absolute', bottom: 0, left: 0, textAlign: 'right', width: 300, height: 300}) + , p = $('<p style="margin-top:200px" />').appendTo(container) + , tooltiped = $('<a href="#" title="very very very very very very very long tooltip">Hover me</a>') .css({marginTop: 200}) .appendTo(p) - .tooltip({placement: "top", animate: false}) - .tooltip("show") + .tooltip({placement: 'top', animate: false}) + .tooltip('show') stop() setTimeout(function () { - var tooltip = container.find(".tooltip") + var tooltip = container.find('.tooltip') start() ok(tooltip.offset().top + tooltip.outerHeight() <= tooltiped.offset().top) @@ -337,21 +337,21 @@ $(function () { }, 100) }) - test("should add position class before positioning so that position-specific styles are taken into account", function () { - $("head").append('<style> .tooltip.right { white-space: nowrap; } .tooltip.right .tooltip-inner { max-width: none; } </style>') + test('should add position class before positioning so that position-specific styles are taken into account', function () { + $('head').append('<style> .tooltip.right { white-space: nowrap; } .tooltip.right .tooltip-inner { max-width: none; } </style>') - var container = $("<div />").appendTo("body") + var container = $('<div />').appendTo('body') , target = $('<a href="#" rel="tooltip" title="very very very very very very very very long tooltip in one line"></a>') .appendTo(container) .tooltip({placement: 'right'}) .tooltip('show') - , tooltip = container.find(".tooltip") + , tooltip = container.find('.tooltip') ok( Math.round(target.offset().top + (target[0].offsetHeight / 2) - (tooltip[0].offsetHeight / 2)) === Math.round(tooltip.offset().top) ) target.tooltip('hide') }) - test("tooltip title test #1", function () { + test('tooltip title test #1', function () { var tooltip = $('<a href="#" rel="tooltip" title="Simple tooltip" style="display: inline-block; position: absolute; top: 0; left: 0;"></a>') .appendTo('#qunit-fixture') .tooltip({ @@ -359,10 +359,10 @@ $(function () { .tooltip('show') equal($('.tooltip').children('.tooltip-inner').text(), 'Simple tooltip', 'title from title attribute is set') tooltip.tooltip('hide') - ok(!$(".tooltip").length, 'tooltip removed') + ok(!$('.tooltip').length, 'tooltip removed') }) - test("tooltip title test #2", function () { + test('tooltip title test #2', function () { var tooltip = $('<a href="#" rel="tooltip" title="Simple tooltip" style="display: inline-block; position: absolute; top: 0; left: 0;"></a>') .appendTo('#qunit-fixture') .tooltip({ @@ -371,10 +371,10 @@ $(function () { .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') + ok(!$('.tooltip').length, 'tooltip removed') }) - test("tooltip title test #3", function () { + test('tooltip title test #3', function () { var tooltip = $('<a href="#" rel="tooltip" style="display: inline-block; position: absolute; top: 0; left: 0;"></a>') .appendTo('#qunit-fixture') .tooltip({ @@ -383,10 +383,10 @@ $(function () { .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') + ok(!$('.tooltip').length, 'tooltip removed') }) - test("tooltips should be placed dynamically, with the dynamic placement option", function () { + test('tooltips should be placed dynamically, with the dynamic placement option', function () { $.support.transition = false var ttContainer = $('<div id="dynamic-tt-test"/>').css({ 'height' : 400 @@ -403,7 +403,7 @@ $(function () { .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') @@ -412,7 +412,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 bottomTooltip = $('<div style="display: inline-block; position: absolute; bottom: 0;" rel="tooltip" title="Bottom tooltip">Bottom Dynamic Tooltip</div>') @@ -420,7 +420,7 @@ $(function () { .tooltip({placement: 'auto bottom'}) .tooltip('show') - ok($(".tooltip").is('.top'), 'bottom positioned tooltip is dynamically positioned top') + ok($('.tooltip').is('.top'), 'bottom positioned tooltip is dynamically positioned top') bottomTooltip.tooltip('hide') var leftTooltip = $('<div style="display: inline-block; position: absolute; left: 0;" rel="tooltip" title="Left tooltip">Left Dynamic Tooltip</div>') @@ -428,7 +428,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() diff --git a/js/tests/unit/transition.js b/js/tests/unit/transition.js index 39c415bc23..79722f8082 100644 --- a/js/tests/unit/transition.js +++ b/js/tests/unit/transition.js @@ -1,12 +1,12 @@ $(function () { - module("transition") + module('transition') - test("should be defined on jquery support object", function () { + test('should be defined on jquery support object', function () { ok($.support.transition !== undefined, 'transition object is defined') }) - test("should provide an end object", function () { + test('should provide an end object', function () { ok($.support.transition ? $.support.transition.end : true, 'end string is defined') }) diff --git a/js/tooltip.js b/js/tooltip.js index d3bf41fb23..7b10d43a2f 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -19,7 +19,7 @@ * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // TOOLTIP PUBLIC CLASS DEFINITION // =============================== @@ -244,7 +244,7 @@ } Tooltip.prototype.replaceArrow = function (delta, dimension, position) { - this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + "%") : '') + this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '') } Tooltip.prototype.setContent = function () { diff --git a/js/transition.js b/js/transition.js index 773dbe6939..5be3b01d43 100644 --- a/js/transition.js +++ b/js/transition.js @@ -18,7 +18,7 @@ * ======================================================================== */ -+function ($) { "use strict"; ++function ($) { 'use strict'; // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/) // ============================================================ |