aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/.jscsrc11
-rw-r--r--js/.jshintrc12
-rw-r--r--js/affix.js4
-rw-r--r--js/carousel.js18
-rw-r--r--js/collapse.js3
-rw-r--r--js/modal.js15
-rw-r--r--js/popover.js2
-rw-r--r--js/scrollspy.js33
-rw-r--r--js/tab.js2
-rw-r--r--js/tests/unit/.jshintrc5
-rw-r--r--js/tests/unit/affix.js13
-rw-r--r--js/tests/unit/alert.js13
-rw-r--r--js/tests/unit/button.js15
-rw-r--r--js/tests/unit/carousel.js5
-rw-r--r--js/tests/unit/collapse.js5
-rw-r--r--js/tests/unit/dropdown.js41
-rw-r--r--js/tests/unit/modal.js56
-rw-r--r--js/tests/unit/phantom.js1
-rw-r--r--js/tests/unit/popover.js23
-rw-r--r--js/tests/unit/scrollspy.js60
-rw-r--r--js/tests/unit/tab.js5
-rw-r--r--js/tests/unit/tooltip.js216
-rw-r--r--js/tooltip.js28
-rw-r--r--js/transition.js3
24 files changed, 410 insertions, 179 deletions
diff --git a/js/.jscsrc b/js/.jscsrc
index 6725ce89d..fb6cd10c2 100644
--- a/js/.jscsrc
+++ b/js/.jscsrc
@@ -1,16 +1,22 @@
{
"disallowEmptyBlocks": true,
"disallowKeywords": ["with"],
- "disallowLeftStickedOperators": ["?", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
+ "disallowLeftStickedOperators": ["?", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"disallowMixedSpacesAndTabs": true,
"disallowMultipleLineStrings": true,
+ "disallowMultipleVarDecl": true,
"disallowQuotedKeysInObjects": "allButReserved",
"disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
"disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
"disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+ "disallowSpacesInNamedFunctionExpression": { "beforeOpeningRoundBrace": true },
+ "disallowSpacesInsideArrayBrackets": true,
+ "disallowSpacesInsideParentheses": true,
+ "disallowTrailingComma": true,
"disallowTrailingWhitespace": true,
"requireCamelCaseOrUpperCaseIdentifiers": true,
"requireCapitalizedConstructors": true,
+ "requireCommaBeforeLineBreak": true,
"requireDotNotation": true,
"requireLeftStickedOperators": [","],
"requireLineFeedAtFileEnd": true,
@@ -18,10 +24,11 @@
"requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
"requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
"requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="],
- "requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true },
+ "requireSpacesInAnonymousFunctionExpression": { "beforeOpeningCurlyBrace": true, "beforeOpeningRoundBrace": true },
"requireSpacesInFunctionDeclaration": { "beforeOpeningCurlyBrace": true },
"requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true },
"requireSpacesInNamedFunctionExpression": { "beforeOpeningCurlyBrace": true },
+ "requireSpacesInsideObjectBrackets": "allButNested",
"validateIndentation": 2,
"validateLineBreaks": "LF",
"validateQuoteMarks": "'"
diff --git a/js/.jshintrc b/js/.jshintrc
index c6104dc93..a59e1d00a 100644
--- a/js/.jshintrc
+++ b/js/.jshintrc
@@ -1,13 +1,15 @@
{
"asi" : true,
- "boss" : true,
"browser" : true,
- "debug" : true,
- "devel" : true,
"eqeqeq" : false,
"eqnull" : true,
+ "es3" : true,
"expr" : true,
+ "jquery" : true,
+ "latedef" : true,
"laxbreak" : true,
- "unused" : true,
- "validthis": true
+ "nonbsp" : true,
+ "strict" : true,
+ "undef" : true,
+ "unused" : true
}
diff --git a/js/affix.js b/js/affix.js
index c7e1b797e..5af32fee6 100644
--- a/js/affix.js
+++ b/js/affix.js
@@ -86,7 +86,9 @@
.trigger($.Event(affixType.replace('affix', 'affixed')))
if (affix == 'bottom') {
- this.$element.offset({ top: scrollHeight - this.$element.height() - offsetBottom })
+ this.$element.offset({
+ top: scrollHeight - this.$element.height() - offsetBottom
+ })
}
}
diff --git a/js/carousel.js b/js/carousel.js
index 2a94a9838..e2cb67a5e 100644
--- a/js/carousel.js
+++ b/js/carousel.js
@@ -36,7 +36,7 @@
wrap: true
}
- Carousel.prototype.cycle = function (e) {
+ Carousel.prototype.cycle = function (e) {
e || (this.paused = false)
this.interval && clearInterval(this.interval)
@@ -103,10 +103,13 @@
$next = this.$element.find('.item')[fallback]()
}
- if ($next.hasClass('active')) return this.sliding = false
+ if ($next.hasClass('active')) return (this.sliding = false)
var relatedTarget = $next[0]
- var slideEvent = $.Event('slide.bs.carousel', { relatedTarget: relatedTarget, direction: direction })
+ var slideEvent = $.Event('slide.bs.carousel', {
+ relatedTarget: relatedTarget,
+ direction: direction
+ })
this.$element.trigger(slideEvent)
if (slideEvent.isDefaultPrevented()) return
@@ -133,7 +136,9 @@
$next.removeClass([type, direction].join(' ')).addClass('active')
$active.removeClass(['active', direction].join(' '))
that.sliding = false
- setTimeout(function () { that.$element.trigger(slidEvent) }, 0)
+ setTimeout(function () {
+ that.$element.trigger(slidEvent)
+ }, 0)
})
.emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000)
} else {
@@ -185,7 +190,8 @@
// =================
$(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
- var $this = $(this), href
+ var href
+ var $this = $(this)
var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
var options = $.extend({}, $target.data(), $this.data())
var slideIndex = $this.attr('data-slide-to')
@@ -193,7 +199,7 @@
Plugin.call($target, options)
- if (slideIndex = $this.attr('data-slide-to')) {
+ if (slideIndex) {
$target.data('bs.carousel').to(slideIndex)
}
diff --git a/js/collapse.js b/js/collapse.js
index 8d6e33289..87098dbd2 100644
--- a/js/collapse.js
+++ b/js/collapse.js
@@ -159,7 +159,8 @@
// =================
$(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) {
- var $this = $(this), href
+ var href
+ var $this = $(this)
var target = $this.attr('data-target')
|| e.preventDefault()
|| (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
diff --git a/js/modal.js b/js/modal.js
index a89eb0c09..f23ba825f 100644
--- a/js/modal.js
+++ b/js/modal.js
@@ -188,7 +188,7 @@
} else if (!this.isShown && this.$backdrop) {
this.$backdrop.removeClass('in')
- var callbackRemove = function() {
+ var callbackRemove = function () {
that.removeBackdrop()
callback && callback()
}
@@ -208,8 +208,8 @@
this.scrollbarWidth = this.scrollbarWidth || this.measureScrollbar()
}
- Modal.prototype.setScrollbar = function () {
- var bodyPad = parseInt(this.$body.css('padding-right') || 0)
+ Modal.prototype.setScrollbar = function () {
+ var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
}
@@ -268,10 +268,13 @@
if ($this.is('a')) e.preventDefault()
- Plugin.call($target, option, this)
- $target.one('hide.bs.modal', function () {
- $this.is(':visible') && $this.trigger('focus')
+ $target.one('show.bs.modal', function (showEvent) {
+ if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown
+ $target.one('hidden.bs.modal', function () {
+ $this.is(':visible') && $this.trigger('focus')
+ })
})
+ Plugin.call($target, option, this)
})
}(jQuery);
diff --git a/js/popover.js b/js/popover.js
index ea76720b8..c8ec3bef4 100644
--- a/js/popover.js
+++ b/js/popover.js
@@ -72,7 +72,7 @@
}
Popover.prototype.arrow = function () {
- return this.$arrow = this.$arrow || this.tip().find('.arrow')
+ return (this.$arrow = this.$arrow || this.tip().find('.arrow'))
}
Popover.prototype.tip = function () {
diff --git a/js/scrollspy.js b/js/scrollspy.js
index 74e016dc9..644c65f94 100644
--- a/js/scrollspy.js
+++ b/js/scrollspy.js
@@ -14,20 +14,17 @@
// ==========================
function ScrollSpy(element, options) {
- var href
var process = $.proxy(this.process, this)
- this.$element = $(element).is('body') ? $(window) : $(element)
this.$body = $('body')
- this.$scrollElement = this.$element.on('scroll.bs.scrollspy', process)
+ this.$scrollElement = $(element).is('body') ? $(window) : $(element)
this.options = $.extend({}, ScrollSpy.DEFAULTS, options)
- this.selector = (this.options.target
- || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
- || '') + ' .nav li > a'
- this.offsets = $([])
- this.targets = $([])
+ this.selector = (this.options.target || '') + ' .nav li > a'
+ this.offsets = []
+ this.targets = []
this.activeTarget = null
+ this.$scrollElement.on('scroll.bs.scrollspy', process)
this.refresh()
this.process()
}
@@ -39,10 +36,16 @@
}
ScrollSpy.prototype.refresh = function () {
- var offsetMethod = this.$element[0] == window ? 'offset' : 'position'
+ var offsetMethod = 'offset'
+ var offsetBase = 0
- this.offsets = $([])
- this.targets = $([])
+ if (!$.isWindow(this.$scrollElement[0])) {
+ offsetMethod = 'position'
+ offsetBase = this.$scrollElement.scrollTop()
+ }
+
+ this.offsets = []
+ this.targets = []
var self = this
@@ -57,7 +60,7 @@
return ($href
&& $href.length
&& $href.is(':visible')
- && [[ $href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null
+ && [[$href[offsetMethod]().top + offsetBase, href]]) || null
})
.sort(function (a, b) { return a[0] - b[0] })
.each(function () {
@@ -69,14 +72,14 @@
ScrollSpy.prototype.process = function () {
var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
var scrollHeight = this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight)
- var maxScroll = scrollHeight - this.$scrollElement.height()
+ var maxScroll = this.options.offset + scrollHeight - this.$scrollElement.height()
var offsets = this.offsets
var targets = this.targets
var activeTarget = this.activeTarget
var i
if (scrollTop >= maxScroll) {
- return activeTarget != (i = targets.last()[0]) && this.activate(i)
+ return activeTarget != (i = targets[targets.length - 1]) && this.activate(i)
}
if (activeTarget && scrollTop <= offsets[0]) {
@@ -87,7 +90,7 @@
activeTarget != targets[i]
&& scrollTop >= offsets[i]
&& (!offsets[i + 1] || scrollTop <= offsets[i + 1])
- && this.activate( targets[i] )
+ && this.activate(targets[i])
}
}
diff --git a/js/tab.js b/js/tab.js
index 0078453c5..51f5cbb68 100644
--- a/js/tab.js
+++ b/js/tab.js
@@ -92,7 +92,7 @@
// TAB PLUGIN DEFINITION
// =====================
- function Plugin( option ) {
+ function Plugin(option) {
return this.each(function () {
var $this = $(this)
var data = $this.data('bs.tab')
diff --git a/js/tests/unit/.jshintrc b/js/tests/unit/.jshintrc
new file mode 100644
index 000000000..682a49af1
--- /dev/null
+++ b/js/tests/unit/.jshintrc
@@ -0,0 +1,5 @@
+{
+ "extends" : "../../.jshintrc",
+ "devel" : true,
+ "qunit" : true
+}
diff --git a/js/tests/unit/affix.js b/js/tests/unit/affix.js
index 404c6605b..1cdfc7f90 100644
--- a/js/tests/unit/affix.js
+++ b/js/tests/unit/affix.js
@@ -1,4 +1,5 @@
$(function () {
+ 'use strict';
module('affix plugin')
@@ -7,11 +8,11 @@ $(function () {
})
module('affix', {
- setup: function() {
+ setup: function () {
// Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
$.fn.bootstrapAffix = $.fn.affix.noConflict()
},
- teardown: function() {
+ teardown: function () {
$.fn.affix = $.fn.bootstrapAffix
delete $.fn.bootstrapAffix
}
@@ -45,7 +46,7 @@ $(function () {
.on('affix.bs.affix', function () {
ok(true, 'affix event triggered')
}).on('affixed.bs.affix', function () {
- ok(true,'affixed event triggered')
+ ok(true, 'affixed event triggered')
$('#affixTarget').remove()
$('#affixAfter').remove()
start()
@@ -53,7 +54,9 @@ $(function () {
setTimeout(function () {
window.scrollTo(0, document.body.scrollHeight)
- setTimeout(function () { window.scroll(0,0) }, 0)
- },0)
+ setTimeout(function () {
+ window.scroll(0, 0)
+ }, 0)
+ }, 0)
})
})
diff --git a/js/tests/unit/alert.js b/js/tests/unit/alert.js
index f5d6075f5..31116cce2 100644
--- a/js/tests/unit/alert.js
+++ b/js/tests/unit/alert.js
@@ -1,4 +1,5 @@
$(function () {
+ 'use strict';
module('alert plugin')
@@ -7,11 +8,11 @@ $(function () {
})
module('alert', {
- setup: function() {
+ setup: function () {
// Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
$.fn.bootstrapAlert = $.fn.alert.noConflict()
},
- teardown: function() {
+ teardown: function () {
$.fn.alert = $.fn.bootstrapAlert
delete $.fn.bootstrapAlert
}
@@ -29,8 +30,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).bootstrapAlert()
+ '</div>'
+ var alert = $(alertHTML).bootstrapAlert()
alert.find('.close').click()
@@ -43,8 +44,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').bootstrapAlert()
+ '</div>'
+ var alert = $(alertHTML).appendTo('#qunit-fixture').bootstrapAlert()
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 da65ae383..671a93891 100644
--- a/js/tests/unit/button.js
+++ b/js/tests/unit/button.js
@@ -1,4 +1,5 @@
$(function () {
+ 'use strict';
module('button plugin')
@@ -7,11 +8,11 @@ $(function () {
})
module('button', {
- setup: function() {
+ setup: function () {
// Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
$.fn.bootstrapButton = $.fn.button.noConflict()
},
- teardown: function() {
+ teardown: function () {
$.fn.button = $.fn.bootstrapButton
delete $.fn.bootstrapButton
}
@@ -88,8 +89,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>')
+ var inner = $('<i></i>')
btn
.append(inner)
.appendTo($('#qunit-fixture'))
@@ -99,9 +100,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>')
+ var btn = $('<button class="btn">fat</button>')
+ var inner = $('<i></i>')
btngroup
.append(btn.append(inner))
.appendTo($('#qunit-fixture'))
diff --git a/js/tests/unit/carousel.js b/js/tests/unit/carousel.js
index 5fd875c8c..474cfb40c 100644
--- a/js/tests/unit/carousel.js
+++ b/js/tests/unit/carousel.js
@@ -1,4 +1,5 @@
$(function () {
+ 'use strict';
module('carousel plugin')
@@ -7,11 +8,11 @@ $(function () {
})
module('carousel', {
- setup: function() {
+ setup: function () {
// Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
$.fn.bootstrapCarousel = $.fn.carousel.noConflict()
},
- teardown: function() {
+ teardown: function () {
$.fn.carousel = $.fn.bootstrapCarousel
delete $.fn.bootstrapCarousel
}
diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js
index a8c6e38a5..4a0cf2b2e 100644
--- a/js/tests/unit/collapse.js
+++ b/js/tests/unit/collapse.js
@@ -1,4 +1,5 @@
$(function () {
+ 'use strict';
module('collapse plugin')
@@ -7,11 +8,11 @@ $(function () {
})
module('collapse', {
- setup: function() {
+ setup: function () {
// Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
$.fn.bootstrapCollapse = $.fn.collapse.noConflict()
},
- teardown: function() {
+ teardown: function () {
$.fn.collapse = $.fn.bootstrapCollapse
delete $.fn.bootstrapCollapse
}
diff --git a/js/tests/unit/dropdown.js b/js/tests/unit/dropdown.js
index f074c5598..f21aa98fc 100644
--- a/js/tests/unit/dropdown.js
+++ b/js/tests/unit/dropdown.js
@@ -1,4 +1,5 @@
$(function () {
+ 'use strict';
module('dropdowns plugin')
@@ -7,11 +8,11 @@ $(function () {
})
module('dropdowns', {
- setup: function() {
+ setup: function () {
// Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
$.fn.bootstrapDropdown = $.fn.dropdown.noConflict()
},
- teardown: function() {
+ teardown: function () {
$.fn.dropdown = $.fn.bootstrapDropdown
delete $.fn.bootstrapDropdown
}
@@ -37,8 +38,8 @@ $(function () {
'<li><a href="#">Another link</a></li>' +
'</ul>' +
'</li>' +
- '</ul>',
- dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
+ '</ul>'
+ var dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
})
@@ -54,8 +55,8 @@ $(function () {
'<li><a href="#">Another link</a></li>' +
'</ul>' +
'</li>' +
- '</ul>',
- dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
+ '</ul>'
+ var dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
ok(!dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
})
@@ -71,8 +72,8 @@ $(function () {
'<li><a href="#">Another link</a></li>' +
'</ul>' +
'</li>' +
- '</ul>',
- dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
+ '</ul>'
+ var dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
})
@@ -88,8 +89,8 @@ $(function () {
'<li><a href="#">Another link</a></li>' +
'</ul>' +
'</li>' +
- '</ul>',
- dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
+ '</ul>'
+ var dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click()
ok(dropdown.parent('.dropdown').hasClass('open'), 'open class added on click')
})
@@ -106,8 +107,8 @@ $(function () {
'<li><a href="#">Another link</a></li>' +
'</ul>' +
'</li>' +
- '</ul>',
- dropdown = $(dropdownHTML)
+ '</ul>'
+ var dropdown = $(dropdownHTML)
.appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]')
.bootstrapDropdown()
@@ -135,10 +136,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>'
+ var dropdowns = $(dropdownHTML).appendTo('#qunit-fixture').find('[data-toggle="dropdown"]')
+ var first = dropdowns.first()
+ var last = dropdowns.last()
ok(dropdowns.length == 2, 'Should be two dropdowns')
@@ -168,8 +169,8 @@ $(function () {
'<li><a href="#">Another link</a></li>' +
'</ul>' +
'</li>' +
- '</ul>',
- dropdown = $(dropdownHTML)
+ '</ul>'
+ var dropdown = $(dropdownHTML)
.appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]')
.bootstrapDropdown()
@@ -202,8 +203,8 @@ $(function () {
'<li><a href="#">Another link</a></li>' +
'</ul>' +
'</li>' +
- '</ul>',
- dropdown = $(dropdownHTML)
+ '</ul>'
+ var dropdown = $(dropdownHTML)
.appendTo('#qunit-fixture')
.find('[data-toggle="dropdown"]')
.bootstrapDropdown()
diff --git a/js/tests/unit/modal.js b/js/tests/unit/modal.js
index d8bef3ea1..a415129aa 100644
--- a/js/tests/unit/modal.js
+++ b/js/tests/unit/modal.js
@@ -1,4 +1,5 @@
$(function () {
+ 'use strict';
module('modal plugin')
@@ -8,11 +9,11 @@ $(function () {
})
module('modal', {
- setup: function() {
+ setup: function () {
// Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
$.fn.bootstrapModal = $.fn.modal.noConflict()
},
- teardown: function() {
+ teardown: function () {
$.fn.modal = $.fn.bootstrapModal
delete $.fn.bootstrapModal
}
@@ -201,4 +202,55 @@ $(function () {
div.remove()
})
+
+ test('should restore focus to toggling element when modal is hidden after having been opened via data-api', function () {
+ stop()
+ $.support.transition = false
+ var toggleBtn = $('<button data-toggle="modal" data-target="#modal-test">Launch modal</button>').appendTo('#qunit-fixture')
+ var div = $('<div id="modal-test"><div class="contents"><div id="close" data-dismiss="modal"></div></div></div>')
+ div
+ .on('hidden.bs.modal', function () {
+ window.setTimeout(function () { // give the focus restoration callback a chance to run
+ equal(document.activeElement, toggleBtn[0], 'toggling element is once again focused')
+ div.remove()
+ toggleBtn.remove()
+ start()
+ }, 0)
+ })
+ .on('shown.bs.modal', function () {
+ $('#close').click()
+ })
+ .appendTo('#qunit-fixture')
+ toggleBtn.click()
+ })
+
+ test('should not restore focus to toggling element if the associated show event gets prevented', function () {
+ stop()
+ $.support.transition = false
+ var toggleBtn = $('<button data-toggle="modal" data-target="#modal-test">Launch modal</button>').appendTo('#qunit-fixture')
+ var otherBtn = $('<button id="other-btn">Golden boy</button>').appendTo('#qunit-fixture')
+ var div = $('<div id="modal-test"><div class="contents"><div id="close" data-dismiss="modal"></div></div></div>')
+ div
+ .one('show.bs.modal', function (e) {
+ e.preventDefault()
+ otherBtn.focus()
+ window.setTimeout(function () { // give the focus event from the previous line a chance to run
+ div.bootstrapModal('show')
+ }, 0)
+ })
+ .on('hidden.bs.modal', function () {
+ window.setTimeout(function () { // give the focus restoration callback a chance to run (except it shouldn't run in this case)
+ equal(document.activeElement, otherBtn[0], 'show was prevented, so focus should not have been restored to toggling element')
+ div.remove()
+ toggleBtn.remove()
+ otherBtn.remove()
+ start()
+ }, 0)
+ })
+ .on('shown.bs.modal', function () {
+ $('#close').click()
+ })
+ .appendTo('#qunit-fixture')
+ toggleBtn.click()
+ })
})
diff --git a/js/tests/unit/phantom.js b/js/tests/unit/phantom.js
index cd184c2f4..b5f0c67a6 100644
--- a/js/tests/unit/phantom.js
+++ b/js/tests/unit/phantom.js
@@ -6,7 +6,6 @@
* Licensed under the MIT license.
*/
-/*global QUnit:true, alert:true*/
(function () {
'use strict';
diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js
index 1a095564b..16f94e143 100644
--- a/js/tests/unit/popover.js
+++ b/js/tests/unit/popover.js
@@ -1,4 +1,5 @@
$(function () {
+ 'use strict';
module('popover plugin')
@@ -8,11 +9,11 @@ $(function () {
})
module('popover', {
- setup: function() {
+ setup: function () {
// Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
$.fn.bootstrapPopover = $.fn.popover.noConflict()
},
- teardown: function() {
+ teardown: function () {
$.fn.popover = $.fn.bootstrapPopover
delete $.fn.bootstrapPopover
}
@@ -46,6 +47,16 @@ $(function () {
ok(!!popover.data('bs.popover'), 'popover instance exists')
})
+ test('should store popover trigger in popover instance data object', function () {
+ $.support.transition = false
+ var popover = $('<a href="#" title="ResentedHook">@ResentedHook</a>')
+ .appendTo('#qunit-fixture')
+ .bootstrapPopover()
+ popover.bootstrapPopover('show')
+ ok(!!$('.popover').data('bs.popover'), 'popover trigger stored in instance data')
+ $('#qunit-fixture').empty()
+ })
+
test('should get title and content from options', function () {
$.support.transition = false
var popover = $('<a href="#">@fat</a>')
@@ -73,7 +84,7 @@ $(function () {
test('should not duplicate HTML object', function () {
$.support.transition = false
- $div = $('<div>').html('loves writing tests （╯°□°）╯︵ ┻━┻')
+ var $div = $('<div>').html('loves writing tests （╯°□°）╯︵ ┻━┻')
var popover = $('<a href="#">@fat</a>')
.appendTo('#qunit-fixture')
@@ -156,7 +167,9 @@ $(function () {
})
test('should destroy popover', function () {
- var popover = $('<div/>').bootstrapPopover({trigger: 'hover'}).on('click.foo', function () {})
+ var popover = $('<div/>').bootstrapPopover({
+ trigger: 'hover'
+ }).on('click.foo', function () {})
ok(popover.data('bs.popover'), 'popover has data')
ok($._data(popover[0], 'events').mouseover && $._data(popover[0], 'events').mouseout, 'popover has hover event')
ok($._data(popover[0], 'events').click[0].namespace == 'foo', 'popover has extra click.foo event')
@@ -164,7 +177,7 @@ $(function () {
popover.bootstrapPopover('destroy')
ok(!popover.hasClass('in'), 'popover is hidden')
ok(!popover.data('popover'), 'popover does not have data')
- ok($._data(popover[0],'events').click[0].namespace == 'foo', 'popover still has click.foo')
+ ok($._data(popover[0], 'events').click[0].namespace == 'foo', 'popover still has click.foo')
ok(!$._data(popover[0], 'events').mouseover && !$._data(popover[0], 'events').mouseout, 'popover does not have any events')
})
diff --git a/js/tests/unit/scrollspy.js b/js/tests/unit/scrollspy.js
index 90c95d769..2ec51fc24 100644
--- a/js/tests/unit/scrollspy.js
+++ b/js/tests/unit/scrollspy.js
@@ -1,4 +1,5 @@
$(function () {
+ 'use strict';
module('scrollspy plugin')
@@ -7,11 +8,11 @@ $(function () {
})
module('scrollspy', {
- setup: function() {
+ setup: function () {
// Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
$.fn.bootstrapScrollspy = $.fn.scrollspy.noConflict()
},
- teardown: function() {
+ teardown: function () {
$.fn.scrollspy = $.fn.bootstrapScrollspy
delete $.fn.bootstrapScrollspy
}
@@ -26,8 +27,9 @@ $(function () {
})
test('should switch active class on scroll', function () {
- var sectionHTML = '<div id="masthead"></div>',
- topbarHTML = '<div class="topbar">' +
+ var sectionHTML = '<div id="masthead"></div>'
+ $(sectionHTML).append('#qunit-fixture')
+ var topbarHTML = '<div class="topbar">' +
'<div class="topbar-inner">' +
'<div class="container">' +
'<h3><a href="#">Bootstrap</a></h3>' +
@@ -35,14 +37,15 @@ $(function () {
'</ul>' +
'</div>' +
'</div>' +
- '</div>',
- $topbar = $(topbarHTML).bootstrapScrollspy()
+ '</div>'
+ var $topbar = $(topbarHTML).bootstrapScrollspy()
$(sectionHTML).append('#qunit-fixture')
ok($topbar.find('.active', true))
})
- test('should only switch active class on current target', function () {
+ asyncTest('should only switch active class on current target', function () {
+ expect(1);
var sectionHTML = '<div id="root" class="active">' +
'<div class="topbar">' +
'<div class="topbar-inner">' +
@@ -68,14 +71,47 @@ $(function () {
'</p>' +
'</div>' +
'</div>' +
- '</div>',
- $section = $(sectionHTML).appendTo('#qunit-fixture'),
- $scrollSpy = $section
+ '</div>'
+ var $section = $(sectionHTML).appendTo('#qunit-fixture')
+ var $scrollSpy = $section
.show()
.find('#scrollspy-example')
- .bootstrapScrollspy({target: '#ss-target'})
+ .bootstrapScrollspy({ target: '#ss-target' })
+ $scrollSpy.on('scroll.bs.scrollspy', function () {
+ ok($section.hasClass('active'), 'Active class still on root node')
+ start()
+ })
$scrollSpy.scrollTop(350);
- ok($section.hasClass('active'), 'Active class still on root node')
+ })
+
+ asyncTest('middle navigation option correctly selected when large offset is used', function () {
+ expect(3);
+ var sectionHTML = '<div id="header" style="height: 500px;"></div>' +
+ '<nav id="navigation" class="navbar">' +
+ '<ul class="nav navbar-nav">' +
+ '<li class="active"><a id="one-link" href="#one">One</a></li>' +
+ '<li><a id="two-link" href="#two">Two</a></li>' +
+ '<li><a id="three-link" href="#three">Three</a></li>' +
+ '</ul>' +
+ '</nav>' +
+ '<div id="content" style="height: 200px; overflow-y: auto;">' +
+ '<div id="one" style="height: 500px;"></div>' +
+ '<div id="two" style="height: 300px;"></div>' +
+ '<div id="three" style="height: 10px;"></div>' +
+ '</div>'
+ var $section = $(sectionHTML).appendTo('#qunit-fixture')
+ var $scrollSpy = $section
+ .show()
+ .filter('#content')
+ $scrollSpy.bootstrapScrollspy({ target: '#navigation', offset: $scrollSpy.position().top })
+
+ $scrollSpy.on('scroll.bs.scrollspy', function () {
+ ok(!$section.find('#one-link').parent().hasClass('active'), 'Active class removed from first section')
+ ok($section.find('#two-link').parent().hasClass('active'), 'Active class on middle section')
+ ok(!$section.find('#three-link').parent().hasClass('active'), 'Active class not on last section')
+ start()
+ })
+ $scrollSpy.scrollTop(550);
})
})
diff --git a/js/tests/unit/tab.js b/js/tests/unit/tab.js
index 7372b7a17..0c49feeaf 100644
--- a/js/tests/unit/tab.js
+++ b/js/tests/unit/tab.js
@@ -1,4 +1,5 @@
$(function () {
+ 'use strict';
module('tabs plugin')
@@ -7,11 +8,11 @@ $(function () {
})
module('tabs', {
- setup: function() {
+ setup: function () {
// Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
$.fn.bootstrapTab = $.fn.tab.noConflict()
},
- teardown: function() {
+ teardown: function () {
$.fn.tab = $.fn.bootstrapTab
delete $.fn.bootstrapTab
}
diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js
index e579a9ef7..f4c840d84 100644
--- a/js/tests/unit/tooltip.js
+++ b/js/tests/unit/tooltip.js
@@ -1,4 +1,5 @@
$(function () {
+ 'use strict';
module('tooltip plugin')
@@ -8,11 +9,11 @@ $(function () {
})
module('tooltip', {
- setup: function() {
+ setup: function () {
// Run all tests in noConflict mode -- it's the only way to ensure that the plugin works in noConflict mode
$.fn.bootstrapTooltip = $.fn.tooltip.noConflict()
},
- teardown: function() {
+ teardown: function () {
$.fn.tooltip = $.fn.bootstrapTooltip
delete $.fn.bootstrapTooltip
}
@@ -41,11 +42,41 @@ $(function () {
equal(tooltip.attr('data-original-title'), 'Another tooltip', 'original title preserved in data attribute')
})
+ test('should add set set aria describedby to the element called on show', function () {
+ var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>').bootstrapTooltip()
+ .appendTo('#qunit-fixture')
+ .bootstrapTooltip('show')
+ ok(tooltip.attr('aria-describedby'), 'has the right attributes')
+ var id = $('.tooltip').attr('id')
+
+ ok($('#' + id).length == 1, 'has a unique id')
+ ok($('.tooltip').attr('aria-describedby') === tooltip.attr('id'), 'they match!')
+ ok(tooltip.attr('aria-describedby') !== undefined, 'has the right attributes')
+ })
+
+ test('should remove the aria-describedby attributes on hide', function () {
+ var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>').bootstrapTooltip()
+ .appendTo('#qunit-fixture')
+ .bootstrapTooltip('show')
+ ok(tooltip.attr('aria-describedby'), 'has the right attributes')
+ tooltip.bootstrapTooltip('hide')
+ ok(!tooltip.attr('aria-describedby'), 'removed the attributes on hide')
+ })
+
+ test('should assign a unique id tooltip element', function () {
+ $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
+ .appendTo('#qunit-fixture')
+ .bootstrapTooltip('show')
+ var id = $('.tooltip').attr('id')
+
+ ok($('#' + id).length == 1 && id.indexOf('tooltip') === 0, 'generated prefixed and unique tooltip id')
+ })
+
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')
- .bootstrapTooltip({placement: 'bottom'})
+ .bootstrapTooltip({ placement: 'bottom' })
.bootstrapTooltip('show')
ok($('.tooltip').is('.fade.bottom.in'), 'has correct classes applied')
@@ -56,7 +87,7 @@ $(function () {
$.support.transition = false
var tooltip = $('<a href="#" rel="tooltip" title="<b>@fat</b>"></a>')
.appendTo('#qunit-fixture')
- .bootstrapTooltip({html: true})
+ .bootstrapTooltip({ html: true })
.bootstrapTooltip('show')
ok($('.tooltip b').length, 'b tag was inserted')
@@ -67,7 +98,7 @@ $(function () {
test('should respect custom classes', function () {
var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
.appendTo('#qunit-fixture')
- .bootstrapTooltip({ template: '<div class="tooltip some-class"><div class="tooltip-arrow"/><div class="tooltip-inner"/></div>'})
+ .bootstrapTooltip({ template: '<div class="tooltip some-class"><div class="tooltip-arrow"/><div class="tooltip-inner"/></div>' })
.bootstrapTooltip('show')
ok($('.tooltip').hasClass('some-class'), 'custom class is present')
@@ -87,9 +118,11 @@ $(function () {
test('should fire shown event', function () {
stop()
- $('<div title="tooltip title"></div>')
+ var tooltip = $('<div title="tooltip title"></div>').appendTo('#qunit-fixture')
+ tooltip
.on('shown.bs.tooltip', function () {
ok(true, 'shown was called')
+ tooltip.remove()
start()
})
.bootstrapTooltip('show')
@@ -111,12 +144,14 @@ $(function () {
test('should fire hide event', function () {
stop()
- $('<div title="tooltip title"></div>')
+ var tooltip = $('<div title="tooltip title"></div>').appendTo('#qunit-fixture')
+ tooltip
.on('shown.bs.tooltip', function () {
$(this).bootstrapTooltip('hide')
})
.on('hide.bs.tooltip', function () {
ok(true, 'hide was called')
+ tooltip.remove()
start()
})
.bootstrapTooltip('show')
@@ -124,12 +159,14 @@ $(function () {
test('should fire hidden event', function () {
stop()
- $('<div title="tooltip title"></div>')
+ var tooltip = $('<div title="tooltip title"></div>').appendTo('#qunit-fixture')
+ tooltip
.on('shown.bs.tooltip', function () {
$(this).bootstrapTooltip('hide')
})
.on('hidden.bs.tooltip', function () {
ok(true, 'hidden was called')
+ tooltip.remove()
start()
})
.bootstrapTooltip('show')
@@ -137,13 +174,15 @@ $(function () {
test('should not fire hidden event when default prevented', function () {
stop()
- $('<div title="tooltip title"></div>')
+ var tooltip = $('<div title="tooltip title"></div>').appendTo('#qunit-fixture')
+ tooltip
.on('shown.bs.tooltip', function () {
$(this).bootstrapTooltip('hide')
})
.on('hide.bs.tooltip', function (e) {
e.preventDefault()
ok(true, 'hide was called')
+ tooltip.remove()
start()
})
.on('hidden.bs.tooltip', function () {
@@ -174,7 +213,7 @@ $(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')
- .bootstrapTooltip({ delay: { show: 200, hide: 0} })
+ .bootstrapTooltip({ delay: { show: 200, hide: 0 }})
stop()
@@ -193,7 +232,7 @@ $(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')
- .bootstrapTooltip({ delay: { show: 0, hide: 200} })
+ .bootstrapTooltip({ delay: { show: 0, hide: 200 }})
stop()
@@ -215,7 +254,7 @@ $(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')
- .bootstrapTooltip({ delay: { show: 0, hide: 200} })
+ .bootstrapTooltip({ delay: { show: 0, hide: 200 }})
stop()
@@ -281,8 +320,9 @@ $(function () {
test('should show tooltip with delegate selector on click', function () {
var div = $('<div><a href="#" rel="tooltip" title="Another tooltip"></a></div>')
- div.appendTo('#qunit-fixture')
- .bootstrapTooltip({ selector: 'a[rel="tooltip"]', trigger: 'click' })
+ div.appendTo('#qunit-fixture').bootstrapTooltip({
+ selector: 'a[rel="tooltip"]', trigger: 'click'
+ })
div.find('a').trigger('click')
ok($('.tooltip').is('.fade.in'), 'tooltip is faded in')
})
@@ -290,15 +330,26 @@ $(function () {
test('should show tooltip when toggle is called', function () {
$('<a href="#" rel="tooltip" title="tooltip on toggle"></a>')
.appendTo('#qunit-fixture')
- .bootstrapTooltip({trigger: 'manual'})
+ .bootstrapTooltip({ trigger: 'manual' })
.bootstrapTooltip('toggle')
ok($('.tooltip').is('.fade.in'), 'tooltip should be toggled in')
})
+ test('should hide shown tooltip when toggle is called on tooltip', function () {
+ var tooltip = $('<a href="#" rel="tooltip" title="tooltip on toggle">@ResentedHook</a>')
+ .appendTo('#qunit-fixture')
+ .bootstrapTooltip({ trigger: 'manual' })
+ .bootstrapTooltip('toggle')
+ $('.tooltip', '#qunit-fixture').bootstrapTooltip('toggle')
+ ok($('.tooltip').not('.fade.in'), 'tooltip should be toggled out')
+ tooltip.bootstrapTooltip('hide')
+ $('#qunit-fixture').empty()
+ })
+
test('should place tooltips inside the body', function () {
var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>')
.appendTo('#qunit-fixture')
- .bootstrapTooltip({container: 'body'})
+ .bootstrapTooltip({ container: 'body' })
.bootstrapTooltip('show')
ok($('body > .tooltip').length, 'inside the body')
ok(!$('#qunit-fixture > .tooltip').length, 'not found in parent')
@@ -307,11 +358,11 @@ $(function () {
test('should place tooltip inside window', function () {
var container = $('<div />').appendTo('body')
- .css({position: 'absolute', width: 200, height: 200, bottom: 0, left: 0})
+ .css({ position: 'absolute', width: 200, height: 200, bottom: 0, left: 0 })
$('<a href="#" title="Very very very very very very very very long tooltip">Hover me</a>')
- .css({position: 'absolute', top: 0, left: 0})
+ .css({ position: 'absolute', top: 0, left: 0 })
.appendTo(container)
- .bootstrapTooltip({placement: 'top', animate: false})
+ .bootstrapTooltip({ placement: 'top', animate: false })
.bootstrapTooltip('show')
stop()
@@ -326,12 +377,12 @@ $(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})
+ .css({ position: 'absolute', bottom: 0, left: 0, textAlign: 'right', width: 300, height: 300 })
+ var p = $('<p style="margin-top:200px" />').appendTo(container)
+ var tooltiped = $('<a href="#" title="very very very very very very very long tooltip">Hover me</a>')
+ .css({ marginTop: 200 })
.appendTo(p)
- .bootstrapTooltip({placement: 'top', animate: false})
+ .bootstrapTooltip({ placement: 'top', animate: false })
.bootstrapTooltip('show')
stop()
@@ -348,17 +399,17 @@ $(function () {
test('should add position class before positioning so that position-specific styles are taken into account', function () {
$('head').append('<style id="test"> .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')
+ var target = $('<a href="#" rel="tooltip" title="very very very very very very very very long tooltip in one line"></a>')
.appendTo(container)
- .bootstrapTooltip({placement: 'right', viewport: null})
- .bootstrapTooltip('show'),
- tooltip = container.find('.tooltip')
+ .bootstrapTooltip({ placement: 'right', viewport: null })
+ .bootstrapTooltip('show')
+ var tooltip = container.find('.tooltip')
// this is some dumb hack shit because sub pixels in firefox
var top = Math.round(target.offset().top + (target[0].offsetHeight / 2) - (tooltip[0].offsetHeight / 2))
var top2 = Math.round(tooltip.offset().top)
- var topDiff = top - top2
+ var topDiff = top - top2
ok(topDiff <= 1 && topDiff >= -1)
target.bootstrapTooltip('hide')
$('head #test').remove()
@@ -401,18 +452,18 @@ $(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
+ 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')
- .bootstrapTooltip({placement: 'auto'})
+ .bootstrapTooltip({ placement: 'auto' })
.bootstrapTooltip('show')
ok($('.tooltip').is('.bottom'), 'top positioned tooltip is dynamically positioned bottom')
@@ -421,7 +472,7 @@ $(function () {
var rightTooltip = $('<div style="display: inline-block; position: absolute; right: 0;" rel="tooltip" title="Right tooltip">Right Dynamic Tooltip</div>')
.appendTo('#dynamic-tt-test')
- .bootstrapTooltip({placement: 'right auto'})
+ .bootstrapTooltip({ placement: 'right auto' })
.bootstrapTooltip('show')
ok($('.tooltip').is('.left'), 'right positioned tooltip is dynamically positioned left')
@@ -429,7 +480,7 @@ $(function () {
var leftTooltip = $('<div style="display: inline-block; position: absolute; left: 0;" rel="tooltip" title="Left tooltip">Left Dynamic Tooltip</div>')
.appendTo('#dynamic-tt-test')
- .bootstrapTooltip({placement: 'auto left'})
+ .bootstrapTooltip({ placement: 'auto left' })
.bootstrapTooltip('show')
ok($('.tooltip').is('.right'), 'left positioned tooltip is dynamically positioned right')
@@ -441,14 +492,14 @@ $(function () {
test('should adjust the tip\'s top when up against the top of the viewport', function () {
$('head').append('<style id="test"> .tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; } </style>')
- var container = $('<div />').appendTo('body'),
- target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; left: 0px;"></a>')
+ var container = $('<div />').appendTo('body')
+ var target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; left: 0px;"></a>')
.appendTo(container)
- .bootstrapTooltip({placement: 'right', viewport: {selector: 'body', padding: 12}})
- .bootstrapTooltip('show'),
- tooltip = container.find('.tooltip')
+ .bootstrapTooltip({ placement: 'right', viewport: { selector: 'body', padding: 12 }})
+ .bootstrapTooltip('show')
+ var tooltip = container.find('.tooltip')
- ok( Math.round(tooltip.offset().top) === 12 )
+ ok(Math.round(tooltip.offset().top) === 12)
target.bootstrapTooltip('hide')
$('head #test').remove()
})
@@ -456,14 +507,14 @@ $(function () {
test('should adjust the tip\'s top when up against the bottom of the viewport', function () {
$('head').append('<style id="test"> .tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; } </style>')
- var container = $('<div />').appendTo('body'),
- target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; bottom: 0px; left: 0px;"></a>')
+ var container = $('<div />').appendTo('body')
+ var target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; bottom: 0px; left: 0px;"></a>')
.appendTo(container)
- .bootstrapTooltip({placement: 'right', viewport: {selector: 'body', padding: 12}})
- .bootstrapTooltip('show'),
- tooltip = container.find('.tooltip')
+ .bootstrapTooltip({ placement: 'right', viewport: { selector: 'body', padding: 12 }})
+ .bootstrapTooltip('show')
+ var tooltip = container.find('.tooltip')
- ok( Math.round(tooltip.offset().top) === Math.round($(window).height() - 12 - tooltip[0].offsetHeight) )
+ ok(Math.round(tooltip.offset().top) === Math.round($(window).height() - 12 - tooltip[0].offsetHeight))
target.bootstrapTooltip('hide')
$('head #test').remove()
})
@@ -471,14 +522,14 @@ $(function () {
test('should adjust the tip\'s left when up against the left of the viewport', function () {
$('head').append('<style id="test"> .tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; } </style>')
- var container = $('<div />').appendTo('body'),
- target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; left: 0px;"></a>')
+ var container = $('<div />').appendTo('body')
+ var target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; left: 0px;"></a>')
.appendTo(container)
- .bootstrapTooltip({placement: 'bottom', viewport: {selector: 'body', padding: 12}})
- .bootstrapTooltip('show'),
- tooltip = container.find('.tooltip')
+ .bootstrapTooltip({ placement: 'bottom', viewport: { selector: 'body', padding: 12 }})
+ .bootstrapTooltip('show')
+ var tooltip = container.find('.tooltip')
- ok( Math.round(tooltip.offset().left) === 12 )
+ ok(Math.round(tooltip.offset().left) === 12)
target.bootstrapTooltip('hide')
$('head #test').remove()
})
@@ -486,14 +537,14 @@ $(function () {
test('should adjust the tip\'s left when up against the right of the viewport', function () {
$('head').append('<style id="test"> .tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; } </style>')
- var container = $('<div />').appendTo('body'),
- target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; right: 0px;"></a>')
+ var container = $('<div />').appendTo('body')
+ var target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 0px; right: 0px;"></a>')
.appendTo(container)
- .bootstrapTooltip({placement: 'bottom', viewport: {selector: 'body', padding: 12}})
- .bootstrapTooltip('show'),
- tooltip = container.find('.tooltip')
+ .bootstrapTooltip({ placement: 'bottom', viewport: { selector: 'body', padding: 12 }})
+ .bootstrapTooltip('show')
+ var tooltip = container.find('.tooltip')
- ok( Math.round(tooltip.offset().left) === Math.round($(window).width() - 12 - tooltip[0].offsetWidth) )
+ ok(Math.round(tooltip.offset().left) === Math.round($(window).width() - 12 - tooltip[0].offsetWidth))
target.bootstrapTooltip('hide')
$('head #test').remove()
})
@@ -502,16 +553,43 @@ $(function () {
$('head').append('<style id="test"> .tooltip, .tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; } </style>')
$('head').append('<style id="viewport-style"> .container-viewport { position: absolute; top: 50px; left: 60px; width: 300px; height: 300px; } </style>')
- var container = $('<div />', {class: 'container-viewport'}).appendTo('body'),
- target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 50px; left: 350px;"></a>')
+ var container = $('<div />', { 'class': 'container-viewport' }).appendTo('body')
+ var target = $('<a href="#" rel="tooltip" title="tip" style="position: fixed; top: 50px; left: 350px;"></a>')
.appendTo(container)
- .bootstrapTooltip({placement: 'bottom', viewport: '.container-viewport'})
- .bootstrapTooltip('show'),
- tooltip = container.find('.tooltip')
+ .bootstrapTooltip({ placement: 'bottom', viewport: '.container-viewport' })
+ .bootstrapTooltip('show')
+ var tooltip = container.find('.tooltip')
- ok( Math.round(tooltip.offset().left) === Math.round(60 + container.width() - tooltip[0].offsetWidth) )
+ ok(Math.round(tooltip.offset().left) === Math.round(60 + container.width() - tooltip[0].offsetWidth))
target.bootstrapTooltip('hide')
$('head #test').remove()
$('head #viewport-style').remove()
})
+
+ test('should not error when trying to show an auto-placed tooltip that has been removed from the dom', function () {
+ var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>').appendTo('#qunit-fixture')
+
+ tooltip
+ .one('show.bs.tooltip', function () {
+ tooltip.remove()
+ })
+ .bootstrapTooltip({ placement: 'auto' })
+
+ var passed = true
+ try {
+ tooltip.bootstrapTooltip('show')
+ }
+ catch (err) {
+ passed = false
+ console.log(err)
+ }
+ ok(passed, '.tooltip(\'show\') should not throw an error in this case')
+
+ try {
+ tooltip.remove()
+ }
+ catch (err) {
+ // tooltip may have already been removed
+ }
+ })
})
diff --git a/js/tooltip.js b/js/tooltip.js
index d985f96e3..b4ced6d2a 100644
--- a/js/tooltip.js
+++ b/js/tooltip.js
@@ -145,12 +145,17 @@
if (this.hasContent() && this.enabled) {
this.$element.trigger(e)
- if (e.isDefaultPrevented()) return
- var that = this;
+ var inDom = $.contains(document.documentElement, this.$element[0])
+ if (e.isDefaultPrevented() || !inDom) return
+ var that = this
var $tip = this.tip()
+ var tipId = this.getUID(this.type)
+
this.setContent()
+ $tip.attr('id', tipId)
+ this.$element.attr('aria-describedby', tipId)
if (this.options.animation) $tip.addClass('fade')
@@ -166,6 +171,7 @@
.detach()
.css({ top: 0, left: 0, display: 'block' })
.addClass(placement)
+ .data('bs.' + this.type, this)
this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
@@ -194,7 +200,7 @@
this.applyPlacement(calculatedOffset, placement)
this.hoverState = null
- var complete = function() {
+ var complete = function () {
that.$element.trigger('shown.bs.' + that.type)
}
@@ -273,6 +279,8 @@
var $tip = this.tip()
var e = $.Event('hide.bs.' + this.type)
+ this.$element.removeAttr('aria-describedby')
+
function complete() {
if (that.hoverState != 'in') $tip.detach()
that.$element.trigger('hidden.bs.' + that.type)
@@ -297,7 +305,7 @@
Tooltip.prototype.fixTitle = function () {
var $e = this.$element
- if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
+ if ($e.attr('title') || typeof ($e.attr('data-original-title')) != 'string') {
$e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
}
}
@@ -314,7 +322,7 @@
scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop(),
width: isBody ? $(window).width() : $element.outerWidth(),
height: isBody ? $(window).height() : $element.outerHeight()
- }, isBody ? {top: 0, left: 0} : $element.offset())
+ }, isBody ? { top: 0, left: 0 } : $element.offset())
}
Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
@@ -364,12 +372,18 @@
return title
}
+ Tooltip.prototype.getUID = function (prefix) {
+ do prefix += ~~(Math.random() * 1000000)
+ while (document.getElementById(prefix))
+ return prefix
+ }
+
Tooltip.prototype.tip = function () {
- return this.$tip = this.$tip || $(this.options.template)
+ return (this.$tip = this.$tip || $(this.options.template))
}
Tooltip.prototype.arrow = function () {
- return this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow')
+ return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow'))
}
Tooltip.prototype.validate = function () {
diff --git a/js/transition.js b/js/transition.js
index b8559c74e..e8c8f992f 100644
--- a/js/transition.js
+++ b/js/transition.js
@@ -34,7 +34,8 @@
// http://blog.alexmaccaw.com/css-transitions
$.fn.emulateTransitionEnd = function (duration) {
- var called = false, $el = this
+ var called = false
+ var $el = this
$(this).one($.support.transition.end, function () { called = true })
var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
setTimeout(callback, duration)
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-07 18:37:06 +0000