diff options
| author | Mark Otto <[email protected]> | 2012-02-06 23:36:31 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-06 23:36:31 -0800 |
| commit | 4ed1b13719083fb9bb7ab7273cc9bf84482992cc (patch) | |
| tree | fd67d1ffb5e9edfc549b5d21e389a9729e4f00ba /js/tests | |
| parent | 575b82473f8d248ca3782fa86ce1c92eea03905c (diff) | |
| parent | 3722bb9a88e95b37ded12cb40a67ac396ce140fd (diff) | |
| download | bootstrap-4ed1b13719083fb9bb7ab7273cc9bf84482992cc.tar.xz bootstrap-4ed1b13719083fb9bb7ab7273cc9bf84482992cc.zip | |
Merge branch 'raphaelz-patch-1' into 2.0.1-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'js/tests')
| -rw-r--r-- | js/tests/unit/bootstrap-alert.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/tests/unit/bootstrap-alert.js b/js/tests/unit/bootstrap-alert.js index f961345c3..e607f4340 100644 --- a/js/tests/unit/bootstrap-alert.js +++ b/js/tests/unit/bootstrap-alert.js @@ -13,7 +13,7 @@ $(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>' + + '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>' + '</div>' , alert = $(alertHTML).alert() @@ -27,7 +27,7 @@ $(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>' + + '<p><strong>Holy guacamole!</strong> Best check yo self, you\'re not looking too good.</p>' + '</div>' , alert = $(alertHTML).appendTo('#qunit-fixture').alert() |