aboutsummaryrefslogtreecommitdiff
path: root/js/tests/unit
diff options
context:
space:
mode:
authorZlatan Vasović <[email protected]>2013-12-15 20:04:32 +0100
committerZlatan Vasović <[email protected]>2013-12-16 18:06:31 +0100
commitba3639b2025b8f0c510087ff8fe522c2bf0b06f1 (patch)
treea3e8d4d3f2a2c4d493e251345ad68d4f121821fc /js/tests/unit
parent2ea370f93ba83aab5d071311758bc1e7bd822dc6 (diff)
downloadbootstrap-ba3639b2025b8f0c510087ff8fe522c2bf0b06f1.tar.xz
bootstrap-ba3639b2025b8f0c510087ff8fe522c2bf0b06f1.zip
Require comma on left side
Diffstat (limited to 'js/tests/unit')
-rw-r--r--js/tests/unit/alert.js8
-rw-r--r--js/tests/unit/button.js10
-rw-r--r--js/tests/unit/dropdown.js56
-rw-r--r--js/tests/unit/popover.js10
-rw-r--r--js/tests/unit/scrollspy.js8
-rw-r--r--js/tests/unit/tooltip.js40
6 files changed, 66 insertions, 66 deletions
diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js
index 5e39bbab6..3fe2e70a3 100644
--- a/js/tests/unit/alert.js
+++ b/js/tests/unit/alert.js
@@ -20,8 +20,8 @@ $(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>'
- + '</div>'
- , alert = $(alertHTML).alert()
+ + '</div>',
+ alert = $(alertHTML).alert()
alert.find('.close').click()
@@ -34,8 +34,8 @@ $(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>'
- + '</div>'
- , alert = $(alertHTML).appendTo('#qunit-fixture').alert()
+ + '</div>',
+ alert = $(alertHTML).appendTo('#qunit-fixture').alert()
ok($('#qunit-fixture').find('.alert-message').length, 'element added to dom')
diff --git a/js/tests/unit/button.js b/js/tests/unit/button.js
index 45397aeff..104e8d857 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -59,8 +59,8 @@ $(function () {
})
test('should toggle active when btn children are clicked', function () {
- var btn = $('<button class="btn" data-toggle="button">mdo</button>')
- , inner = $('<i></i>')
+ var btn = $('<button class="btn" data-toggle="button">mdo</button>'),
+ inner = $('<i></i>')
btn
.append(inner)
.appendTo($('#qunit-fixture'))
@@ -70,9 +70,9 @@ $(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>')
+ var btngroup = $('<div class="btn-group" data-toggle="buttons"></div>'),
+ btn = $('<button class="btn">fat</button>'),
+ inner = $('<i></i>')
btngroup
.append(btn.append(inner))
.appendTo($('#qunit-fixture'))
diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js
index c94cf4fca..34e11de1c 100644
--- a/js/tests/unit/dropdown.js
+++ b/js/tests/unit/dropdown.js
@@ -28,8 +28,8 @@ $(function () {
+ '<li><a href="#">Another link</a></li>'
+ '</ul>'
+ '</li>'
- + '</ul>'
- , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
+ + '</ul>',
+ dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
})
@@ -45,8 +45,8 @@ $(function () {
+ '<li><a href="#">Another link</a></li>'
+ '</ul>'
+ '</li>'
- + '</ul>'
- , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
+ + '</ul>',
+ dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
})
@@ -62,8 +62,8 @@ $(function () {
+ '<li><a href="#">Another link</a></li>'
+ '</ul>'
+ '</li>'
- + '</ul>'
- , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
+ + '</ul>',
+ dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
})
@@ -79,8 +79,8 @@ $(function () {
+ '<li><a href="#">Another link</a></li>'
+ '</ul>'
+ '</li>'
- + '</ul>'
- , dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
+ + '</ul>',
+ dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').dropdown().click()
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
})
@@ -97,12 +97,12 @@ $(function () {
+ '<li><a href="#">Another link</a></li>'
+ '</ul>'
+ '</li>'
- + '</ul>'
- , dropdown = $(dropdownHTML)
- .appendTo('#qunit-fixture')
- .find('[data-toggle="dropdown"]')
- .dropdown()
- .click()
+ + '</ul>',
+ dropdown = $(dropdownHTML)
+ .appendTo('#qunit-fixture')
+ .find('[data-toggle="dropdown"]')
+ .dropdown()
+ .click()
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
$('body').click()
@@ -127,10 +127,10 @@ $(function () {
+ ' <ul class="dropdown-menu">'
+ ' <li><a href="#">Action 1</a></li>'
+ ' </ul>'
- + '</div>'
- , dropdowns = $(dropdownHTML).appendTo('#qunit-fixture').find('[data-toggle="dropdown"]')
- , first = dropdowns.first()
- , last = dropdowns.last()
+ + '</div>',
+ dropdowns = $(dropdownHTML).appendTo('#qunit-fixture').find('[data-toggle="dropdown"]'),
+ first = dropdowns.first(),
+ last = dropdowns.last()
ok(dropdowns.length == 2, 'Should be two dropdowns')
@@ -160,11 +160,11 @@ $(function () {
+ '<li><a href="#">Another link</a></li>'
+ '</ul>'
+ '</li>'
- + '</ul>'
- , dropdown = $(dropdownHTML)
- .appendTo('#qunit-fixture')
- .find('[data-toggle="dropdown"]')
- .dropdown()
+ + '</ul>',
+ dropdown = $(dropdownHTML)
+ .appendTo('#qunit-fixture')
+ .find('[data-toggle="dropdown"]')
+ .dropdown()
stop()
@@ -194,11 +194,11 @@ $(function () {
+ '<li><a href="#">Another link</a></li>'
+ '</ul>'
+ '</li>'
- + '</ul>'
- , dropdown = $(dropdownHTML)
- .appendTo('#qunit-fixture')
- .find('[data-toggle="dropdown"]')
- .dropdown()
+ + '</ul>',
+ dropdown = $(dropdownHTML)
+ .appendTo('#qunit-fixture')
+ .find('[data-toggle="dropdown"]')
+ .dropdown()
stop()
diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js
index 5ed4252be..ecab948c7 100644
--- a/js/tests/unit/popover.js
+++ b/js/tests/unit/popover.js
@@ -44,8 +44,8 @@ $(function () {
.popover({
title: function () {
return '@fat'
- }
- , content: function () {
+ },
+ content: function () {
return 'loves writing tests (╯°□°)╯︵ ┻━┻'
}
})
@@ -102,9 +102,9 @@ $(function () {
var popover = $('<a href="#">@fat</a>')
.appendTo('#qunit-fixture')
.popover({
- title: 'Test'
- , content: 'Test'
- , template: '<div class="popover foobar"><div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div></div>'
+ title: 'Test',
+ content: 'Test',
+ template: '<div class="popover foobar"><div class="arrow"></div><div class="inner"><h3 class="title"></h3><div class="content"><p></p></div></div></div>'
})
popover.popover('show')
diff --git a/js/tests/unit/scrollspy.js b/js/tests/unit/scrollspy.js
index 8ebf3dcdf..ffc3d9a46 100644
--- a/js/tests/unit/scrollspy.js
+++ b/js/tests/unit/scrollspy.js
@@ -18,8 +18,8 @@ $(function () {
test('should switch active class on scroll', function () {
var sectionHTML = '<div id="masthead"></div>'
- , $section = $(sectionHTML).append('#qunit-fixture')
- , topbarHTML = '<div class="topbar">'
+ $section = $(sectionHTML).append('#qunit-fixture'),
+ topbarHTML = '<div class="topbar">'
+ '<div class="topbar-inner">'
+ '<div class="container">'
+ '<h3><a href="#">Bootstrap</a></h3>'
@@ -28,8 +28,8 @@ $(function () {
+ '</ul>'
+ '</div>'
+ '</div>'
- + '</div>'
- , $topbar = $(topbarHTML).scrollspy()
+ + '</div>',
+ $topbar = $(topbarHTML).scrollspy()
ok($topbar.find('.active', true))
})
diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js
index dbfeacb82..d921bee7f 100644
--- a/js/tests/unit/tooltip.js
+++ b/js/tests/unit/tooltip.js
@@ -299,8 +299,8 @@ $(function () {
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', 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})
@@ -318,13 +318,13 @@ $(function () {
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')
+ .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')
stop()
@@ -340,12 +340,12 @@ $(function () {
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')
- , target = $('<a href="#" rel="tooltip" title="very very very very very very very very long tooltip in one line"></a>')
+ 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('show'),
+ 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')
@@ -389,13 +389,13 @@ $(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
- , '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 = $('<div style="display: inline-block; position: absolute; left: 0; top: 0;" rel="tooltip" title="Top tooltip">Top Dynamic Tooltip</div>')
.appendTo('#dynamic-tt-test')