Merge branch 'master' into pr/10951

Conflicts:
	dist/css/bootstrap.min.css
	less/modals.less

1 files changed, 17 insertions, 17 deletions

diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js
index badf0886d..8d1726b71 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">&lsaquo;</a><a class="right carousel-control" href="#myCarousel" data-slide="next">&rsaquo;</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">&lsaquo;</a><a class="right carousel-control" href="#myCarousel" data-slide="next">&rsaquo;</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">&lsaquo;</a> <a class="right carousel-control" href="#myCarousel" data-slide="next">&rsaquo;</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();
       })
 })