From e84b0c0433509bde0b42354754372595db523e1f Mon Sep 17 00:00:00 2001 From: Mike Robinet Date: Tue, 13 May 2014 09:57:04 -0500 Subject: Adjust for Scrollspy offset when calculating maxScroll. --- js/scrollspy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/scrollspy.js b/js/scrollspy.js index 74e016dc9..53e1c48ba 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -69,7 +69,7 @@ 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 -- cgit v1.2.3 From c2e94eba8da462ba8cacbc1558f7fdf6b3e28007 Mon Sep 17 00:00:00 2001 From: Mike Robinet Date: Tue, 13 May 2014 12:20:18 -0500 Subject: Add Scrollspy maxScroll with offset test. --- js/tests/unit/scrollspy.js | 38 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 36 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/tests/unit/scrollspy.js b/js/tests/unit/scrollspy.js index 90c95d769..9a00221fd 100644 --- a/js/tests/unit/scrollspy.js +++ b/js/tests/unit/scrollspy.js @@ -42,7 +42,8 @@ $(function () { 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 = '
' + '
' + '
' + @@ -75,7 +76,40 @@ $(function () { .find('#scrollspy-example') .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 = '' + + '' + + '
' + + '
' + + '
' + + '
' + + '
', + $section = $(sectionHTML).appendTo('#qunit-fixture'), + $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); }) }) -- cgit v1.2.3 From 122c05dbd87d9708086da4d097f7e715233f3b2c Mon Sep 17 00:00:00 2001 From: "j.corns" Date: Wed, 14 May 2014 10:36:32 -0700 Subject: Add tooltip self-reference to address #12320 primarily adds a data- attribute to the tooltip (and thus, the popover) to create a self-reference. --- js/tests/unit/popover.js | 10 ++++++++++ js/tests/unit/tooltip.js | 11 +++++++++++ js/tooltip.js | 1 + 3 files changed, 22 insertions(+) (limited to 'js') diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js index 1a095564b..b28e1f3a7 100644 --- a/js/tests/unit/popover.js +++ b/js/tests/unit/popover.js @@ -46,6 +46,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 = $('@ResentedHook') + .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 = $('@fat') diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index e579a9ef7..6c24111b8 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -295,6 +295,17 @@ $(function () { ok($('.tooltip').is('.fade.in'), 'tooltip should be toggled in') }) + test('should hide shown tooltip when toggle is called on tooltip', function () { + var tooltip = $('@ResentedHook') + .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 = $('') .appendTo('#qunit-fixture') diff --git a/js/tooltip.js b/js/tooltip.js index d985f96e3..076f2fa1c 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -166,6 +166,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) -- cgit v1.2.3 From a70da16f6fb8c665f22b78b49a1dff998f1da8a7 Mon Sep 17 00:00:00 2001 From: Steven Bassett Date: Thu, 8 May 2014 20:19:12 -0700 Subject: Adds aria described by to tooltip plugin for accessibility Generates a unique id for tooltip and adds [aria-describedby] to the element it is called on. Resolves issue #13480 - set up test - linted the code styles - passed the tests - integrated feedback from @cvrebert --- js/tests/unit/tooltip.js | 30 ++++++++++++++++++++++++++++++ js/tooltip.js | 12 ++++++++++++ 2 files changed, 42 insertions(+) (limited to 'js') diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index e579a9ef7..e95b91cbb 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -41,6 +41,36 @@ $(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 = $('').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 = $('').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 () { + $('') + .appendTo('#qunit-fixture') + .bootstrapTooltip('show'), + 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 = $('') diff --git a/js/tooltip.js b/js/tooltip.js index d985f96e3..936424830 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -150,7 +150,11 @@ 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') @@ -273,6 +277,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) @@ -364,6 +370,12 @@ 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) } -- cgit v1.2.3 From b058c018eba059811f0c26074b813b843cfb5cb7 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 19 May 2014 01:25:52 -0700 Subject: Hopefully a fix for #12364 * register the callback before invoking the toggling * listen for `hidden` instead of `hide` * account for the possibility of the associated `show` event being preventDefault-ed Adds relevant unit tests. --- js/modal.js | 9 ++++++--- js/tests/unit/modal.js | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 3 deletions(-) (limited to 'js') diff --git a/js/modal.js b/js/modal.js index a89eb0c09..20c6712b3 100644 --- a/js/modal.js +++ b/js/modal.js @@ -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/tests/unit/modal.js b/js/tests/unit/modal.js index c1dc895e3..6db29ebb2 100644 --- a/js/tests/unit/modal.js +++ b/js/tests/unit/modal.js @@ -201,4 +201,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 = $('').appendTo('#qunit-fixture') + var 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 = $('').appendTo('#qunit-fixture') + var otherBtn = $('').appendTo('#qunit-fixture') + var 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() + }) }) -- cgit v1.2.3 From 5ef9383f5388ba7a701c4377b43ebdbedb0bf748 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 17 Mar 2014 09:07:21 +0200 Subject: Tweak JSHint and JSCS checks. Be more consistent across the whole codebase. Also, make use of JSHint's 2.5.1 `extends` and `qunit` options. This way we set our basis options in js/.jshintrc and override the rest. --- js/.jscsrc | 11 +++++++++-- js/.jshintrc | 12 +++++++----- js/tests/unit/.jshintrc | 5 +++++ js/tests/unit/phantom.js | 1 - 4 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 js/tests/unit/.jshintrc (limited to 'js') 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/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/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'; -- cgit v1.2.3 From 7b0acf14d8a7c7c6089035a848cba540ed963f36 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 17 Mar 2014 09:12:55 +0200 Subject: Comply to the new style. --- js/carousel.js | 5 +- js/collapse.js | 3 +- js/modal.js | 4 +- js/popover.js | 2 +- js/scrollspy.js | 5 +- js/tab.js | 2 +- js/tests/unit/affix.js | 11 ++-- js/tests/unit/alert.js | 13 ++--- js/tests/unit/button.js | 15 +++--- js/tests/unit/carousel.js | 5 +- js/tests/unit/collapse.js | 5 +- js/tests/unit/dropdown.js | 41 ++++++++------- js/tests/unit/modal.js | 5 +- js/tests/unit/popover.js | 11 ++-- js/tests/unit/scrollspy.js | 30 ++++++----- js/tests/unit/tab.js | 5 +- js/tests/unit/tooltip.js | 127 +++++++++++++++++++++++---------------------- js/tooltip.js | 8 +-- js/transition.js | 3 +- 19 files changed, 157 insertions(+), 143 deletions(-) (limited to 'js') diff --git a/js/carousel.js b/js/carousel.js index 2a94a9838..56aa8eb91 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -103,7 +103,7 @@ $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 }) @@ -185,7 +185,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') 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..21f8ddfd1 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() } @@ -209,7 +209,7 @@ } Modal.prototype.setScrollbar = function () { - var bodyPad = parseInt(this.$body.css('padding-right') || 0) + var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10) if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad + this.scrollbarWidth) } 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 53e1c48ba..cddde45ad 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -43,7 +43,6 @@ this.offsets = $([]) this.targets = $([]) - var self = this this.$body @@ -57,7 +56,7 @@ return ($href && $href.length && $href.is(':visible') - && [[ $href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]]) || null + && [[$href[offsetMethod]().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href]]) || null }) .sort(function (a, b) { return a[0] - b[0] }) .each(function () { @@ -87,7 +86,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/affix.js b/js/tests/unit/affix.js index 404c6605b..03f25eb59 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,7 @@ $(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 = '
' + '×' + '

Holy guacamole! Best check yo self, you\'re not looking too good.

' + - '
', - alert = $(alertHTML).bootstrapAlert() + '
' + var alert = $(alertHTML).bootstrapAlert() alert.find('.close').click() @@ -43,8 +44,8 @@ $(function () { var alertHTML = '
' + '×' + '

Holy guacamole! Best check yo self, you\'re not looking too good.

' + - '
', - alert = $(alertHTML).appendTo('#qunit-fixture').bootstrapAlert() + '
' + 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 = $(''), - inner = $('') + var btn = $('') + var inner = $('') 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 = $('
'), - btn = $(''), - inner = $('') + var btngroup = $('
') + var btn = $('') + var inner = $('') 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 () { '
  • Another link
    • ' + '' + '' + - '', - dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click() + '' + 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 () { '
  • Another link
    • ' + '' + '' + - '', - dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click() + '' + 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 () { '
  • Another link
    • ' + '' + '' + - '', - dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click() + '' + 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 () { '
  • Another link
    • ' + '' + '' + - '', - dropdown = $(dropdownHTML).find('[data-toggle="dropdown"]').bootstrapDropdown().click() + '' + 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 () { '
  • Another link
    • ' + '' + '' + - '', - dropdown = $(dropdownHTML) + '' + var dropdown = $(dropdownHTML) .appendTo('#qunit-fixture') .find('[data-toggle="dropdown"]') .bootstrapDropdown() @@ -135,10 +136,10 @@ $(function () { ' ' + - '
    ', - dropdowns = $(dropdownHTML).appendTo('#qunit-fixture').find('[data-toggle="dropdown"]'), - first = dropdowns.first(), - last = dropdowns.last() + '' + 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 () { '
  • Another link
    • ' + '' + '' + - '', - dropdown = $(dropdownHTML) + '' + var dropdown = $(dropdownHTML) .appendTo('#qunit-fixture') .find('[data-toggle="dropdown"]') .bootstrapDropdown() @@ -202,8 +203,8 @@ $(function () { '
  • Another link
    • ' + '' + '' + - '', - dropdown = $(dropdownHTML) + '' + 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..782af9221 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 } diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js index b28e1f3a7..2ccf2cbbf 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 } @@ -83,7 +84,7 @@ $(function () { test('should not duplicate HTML object', function () { $.support.transition = false - $div = $('
    ').html('loves writing tests （╯°□°）╯︵ ┻━┻') + var $div = $('
    ').html('loves writing tests （╯°□°）╯︵ ┻━┻') var popover = $('@fat') .appendTo('#qunit-fixture') @@ -166,7 +167,7 @@ $(function () { }) test('should destroy popover', function () { - var popover = $('
    ').bootstrapPopover({trigger: 'hover'}).on('click.foo', function () {}) + var popover = $('
    ').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') @@ -174,7 +175,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 9a00221fd..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 = '
    ', - topbarHTML = '
    ' + + var sectionHTML = '
    ' + $(sectionHTML).append('#qunit-fixture') + var topbarHTML = '
    ' + '
    ' + '
    ' + '

    Bootstrap

    ' + @@ -35,8 +37,8 @@ $(function () { '' + '
    ' + '
    ' + - '
    ', - $topbar = $(topbarHTML).bootstrapScrollspy() + '
    ' + var $topbar = $(topbarHTML).bootstrapScrollspy() $(sectionHTML).append('#qunit-fixture') ok($topbar.find('.active', true)) @@ -69,12 +71,12 @@ $(function () { '

    ' + '
    ' + '
    ' + - '
    ', - $section = $(sectionHTML).appendTo('#qunit-fixture'), - $scrollSpy = $section + '
    ' + 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') @@ -97,12 +99,12 @@ $(function () { '
    ' + '
    ' + '
    ' + - '', - $section = $(sectionHTML).appendTo('#qunit-fixture'), - $scrollSpy = $section + '' + var $section = $(sectionHTML).appendTo('#qunit-fixture') + var $scrollSpy = $section .show() .filter('#content') - $scrollSpy.bootstrapScrollspy({target: '#navigation', offset: $scrollSpy.position().top}) + $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') 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 79e120691..466f88a64 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,7 +42,7 @@ $(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() { + test('should add set set aria describedby to the element called on show', function () { var tooltip = $('').bootstrapTooltip() .appendTo('#qunit-fixture') .bootstrapTooltip('show') @@ -53,7 +54,7 @@ $(function () { ok(tooltip.attr('aria-describedby') !== undefined, 'has the right attributes') }) - test('should remove the aria-describedby attributes on hide', function() { + test('should remove the aria-describedby attributes on hide', function () { var tooltip = $('').bootstrapTooltip() .appendTo('#qunit-fixture') .bootstrapTooltip('show') @@ -65,17 +66,17 @@ $(function () { test('should assign a unique id tooltip element', function () { $('') .appendTo('#qunit-fixture') - .bootstrapTooltip('show'), - id = $('.tooltip').attr('id') + .bootstrapTooltip('show') + var id = $('.tooltip').attr('id') - ok( $('#' + id).length == 1 && id.indexOf('tooltip') === 0, 'generated prefixed and unique tooltip 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 = $('') .appendTo('#qunit-fixture') - .bootstrapTooltip({placement: 'bottom'}) + .bootstrapTooltip({ placement: 'bottom' }) .bootstrapTooltip('show') ok($('.tooltip').is('.fade.bottom.in'), 'has correct classes applied') @@ -86,7 +87,7 @@ $(function () { $.support.transition = false var tooltip = $('') .appendTo('#qunit-fixture') - .bootstrapTooltip({html: true}) + .bootstrapTooltip({ html: true }) .bootstrapTooltip('show') ok($('.tooltip b').length, 'b tag was inserted') @@ -97,7 +98,7 @@ $(function () { test('should respect custom classes', function () { var tooltip = $('') .appendTo('#qunit-fixture') - .bootstrapTooltip({ template: '
    '}) + .bootstrapTooltip({ template: '
    ' }) .bootstrapTooltip('show') ok($('.tooltip').hasClass('some-class'), 'custom class is present') @@ -204,7 +205,7 @@ $(function () { test('should not show tooltip if leave event occurs before delay expires, even if hide delay is 0', function () { var tooltip = $('') .appendTo('#qunit-fixture') - .bootstrapTooltip({ delay: { show: 200, hide: 0} }) + .bootstrapTooltip({ delay: { show: 200, hide: 0 }}) stop() @@ -223,7 +224,7 @@ $(function () { test('should wait 200 ms before hiding the tooltip', 3, function () { var tooltip = $('') .appendTo('#qunit-fixture') - .bootstrapTooltip({ delay: { show: 0, hide: 200} }) + .bootstrapTooltip({ delay: { show: 0, hide: 200 }}) stop() @@ -245,7 +246,7 @@ $(function () { test('should not hide tooltip if leave event occurs, then tooltip is show immediately again', function () { var tooltip = $('') .appendTo('#qunit-fixture') - .bootstrapTooltip({ delay: { show: 0, hide: 200} }) + .bootstrapTooltip({ delay: { show: 0, hide: 200 }}) stop() @@ -320,7 +321,7 @@ $(function () { test('should show tooltip when toggle is called', function () { $('') .appendTo('#qunit-fixture') - .bootstrapTooltip({trigger: 'manual'}) + .bootstrapTooltip({ trigger: 'manual' }) .bootstrapTooltip('toggle') ok($('.tooltip').is('.fade.in'), 'tooltip should be toggled in') }) @@ -328,7 +329,7 @@ $(function () { test('should hide shown tooltip when toggle is called on tooltip', function () { var tooltip = $('@ResentedHook') .appendTo('#qunit-fixture') - .bootstrapTooltip({trigger: 'manual'}) + .bootstrapTooltip({ trigger: 'manual' }) .bootstrapTooltip('toggle') $('.tooltip', '#qunit-fixture').bootstrapTooltip('toggle') ok($('.tooltip').not('.fade.in'), 'tooltip should be toggled out') @@ -339,7 +340,7 @@ $(function () { test('should place tooltips inside the body', function () { var tooltip = $('') .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') @@ -348,11 +349,11 @@ $(function () { test('should place tooltip inside window', function () { var container = $('
    ').appendTo('body') - .css({position: 'absolute', width: 200, height: 200, bottom: 0, left: 0}) + .css({ position: 'absolute', width: 200, height: 200, bottom: 0, left: 0 }) $('Hover me') - .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() @@ -367,12 +368,12 @@ $(function () { test('should place tooltip on top of element', function () { var container = $('
    ').appendTo('body') - .css({position: 'absolute', bottom: 0, left: 0, textAlign: 'right', width: 300, height: 300}), - p = $('

    ').appendTo(container), - tooltiped = $('Hover me') - .css({marginTop: 200}) + .css({ position: 'absolute', bottom: 0, left: 0, textAlign: 'right', width: 300, height: 300 }) + var p = $('

    ').appendTo(container) + var tooltiped = $('Hover me') + .css({ marginTop: 200 }) .appendTo(p) - .bootstrapTooltip({placement: 'top', animate: false}) + .bootstrapTooltip({ placement: 'top', animate: false }) .bootstrapTooltip('show') stop() @@ -389,17 +390,17 @@ $(function () { test('should add position class before positioning so that position-specific styles are taken into account', function () { $('head').append('') - var container = $('

    ').appendTo('body'), - target = $('') + var container = $('
    ').appendTo('body') + var target = $('') .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() @@ -453,7 +454,7 @@ $(function () { var topTooltip = $('
    Top Dynamic Tooltip
    ') .appendTo('#dynamic-tt-test') - .bootstrapTooltip({placement: 'auto'}) + .bootstrapTooltip({ placement: 'auto' }) .bootstrapTooltip('show') ok($('.tooltip').is('.bottom'), 'top positioned tooltip is dynamically positioned bottom') @@ -462,7 +463,7 @@ $(function () { var rightTooltip = $('
    Right Dynamic Tooltip
    ') .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') @@ -470,7 +471,7 @@ $(function () { var leftTooltip = $('
    Left Dynamic Tooltip
    ') .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') @@ -482,14 +483,14 @@ $(function () { test('should adjust the tip\'s top when up against the top of the viewport', function () { $('head').append('') - var container = $('
    ').appendTo('body'), - target = $('') + var container = $('
    ').appendTo('body') + var target = $('') .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() }) @@ -497,14 +498,14 @@ $(function () { test('should adjust the tip\'s top when up against the bottom of the viewport', function () { $('head').append('') - var container = $('
    ').appendTo('body'), - target = $('') + var container = $('
    ').appendTo('body') + var target = $('') .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() }) @@ -512,14 +513,14 @@ $(function () { test('should adjust the tip\'s left when up against the left of the viewport', function () { $('head').append('') - var container = $('
    ').appendTo('body'), - target = $('') + var container = $('
    ').appendTo('body') + var target = $('') .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() }) @@ -527,14 +528,14 @@ $(function () { test('should adjust the tip\'s left when up against the right of the viewport', function () { $('head').append('') - var container = $('
    ').appendTo('body'), - target = $('') + var container = $('
    ').appendTo('body') + var target = $('') .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() }) @@ -543,14 +544,14 @@ $(function () { $('head').append('') $('head').append('') - var container = $('
    ', {class: 'container-viewport'}).appendTo('body'), - target = $('') + var container = $('
    ', { 'class': 'container-viewport' }).appendTo('body') + var target = $('') .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() diff --git a/js/tooltip.js b/js/tooltip.js index f0f8a7c18..0dd4c1fa6 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -199,7 +199,7 @@ this.applyPlacement(calculatedOffset, placement) this.hoverState = null - var complete = function() { + var complete = function () { that.$element.trigger('shown.bs.' + that.type) } @@ -321,7 +321,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) { @@ -378,11 +378,11 @@ } 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) -- cgit v1.2.3 From 82fc03f3b6caccd134827a83c346456b920f4ba8 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 22 May 2014 09:48:17 +0300 Subject: carousel.js: remove unneeded variable assignment. `slideIndex` is assigned to the same value a few lines above. --- js/carousel.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'js') diff --git a/js/carousel.js b/js/carousel.js index 56aa8eb91..bda09543f 100644 --- a/js/carousel.js +++ b/js/carousel.js @@ -194,7 +194,7 @@ Plugin.call($target, options) - if (slideIndex = $this.attr('data-slide-to')) { + if (slideIndex) { $target.data('bs.carousel').to(slideIndex) } -- cgit v1.2.3 From e2cabe4971927e3dbbbda4c81ae8f74abdee2d15 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 29 May 2014 07:35:22 +0300 Subject: Minor style tweaks. --- js/affix.js | 4 +++- js/carousel.js | 11 ++++++++--- js/modal.js | 2 +- js/tests/unit/affix.js | 4 +++- js/tests/unit/popover.js | 4 +++- js/tests/unit/tooltip.js | 17 +++++++++-------- js/tooltip.js | 2 +- 7 files changed, 28 insertions(+), 16 deletions(-) (limited to 'js') 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 bda09543f..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) @@ -106,7 +106,10 @@ 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 { diff --git a/js/modal.js b/js/modal.js index 21f8ddfd1..2004a23de 100644 --- a/js/modal.js +++ b/js/modal.js @@ -208,7 +208,7 @@ this.scrollbarWidth = this.scrollbarWidth || this.measureScrollbar() } - Modal.prototype.setScrollbar = function () { + 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) } diff --git a/js/tests/unit/affix.js b/js/tests/unit/affix.js index 03f25eb59..1cdfc7f90 100644 --- a/js/tests/unit/affix.js +++ b/js/tests/unit/affix.js @@ -54,7 +54,9 @@ $(function () { setTimeout(function () { window.scrollTo(0, document.body.scrollHeight) - setTimeout(function () { window.scroll(0, 0) }, 0) + setTimeout(function () { + window.scroll(0, 0) + }, 0) }, 0) }) }) diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js index 2ccf2cbbf..16f94e143 100644 --- a/js/tests/unit/popover.js +++ b/js/tests/unit/popover.js @@ -167,7 +167,9 @@ $(function () { }) test('should destroy popover', function () { - var popover = $('
    ').bootstrapPopover({ trigger: 'hover' }).on('click.foo', function () {}) + var popover = $('
    ').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') diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index 466f88a64..2e175583e 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -312,8 +312,9 @@ $(function () { test('should show tooltip with delegate selector on click', function () { var 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') }) @@ -443,12 +444,12 @@ $(function () { test('tooltips should be placed dynamically, with the dynamic placement option', function () { $.support.transition = false var ttContainer = $('
    ').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') diff --git a/js/tooltip.js b/js/tooltip.js index 0dd4c1fa6..3b8ac17f6 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -304,7 +304,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', '') } } -- cgit v1.2.3 From 20c099d41a0802a7f377e7f996c35cade9e0c431 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 6 Jun 2014 14:49:59 -0700 Subject: add failing test for #13268 --- js/tests/unit/tooltip.js | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'js') diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index 2e175583e..81c0fdf73 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -557,4 +557,31 @@ $(function () { $('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 = $('').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 + } + }) }) -- cgit v1.2.3 From b23ed1b034caa90a4f6d0f97674022c80126d078 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 6 Jun 2014 15:30:44 -0700 Subject: put the tooltips into the DOM in the tooltip unit tests --- js/tests/unit/tooltip.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'js') diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index 81c0fdf73..f4c840d84 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -118,9 +118,11 @@ $(function () { test('should fire shown event', function () { stop() - $('
    ') + var tooltip = $('
    ').appendTo('#qunit-fixture') + tooltip .on('shown.bs.tooltip', function () { ok(true, 'shown was called') + tooltip.remove() start() }) .bootstrapTooltip('show') @@ -142,12 +144,14 @@ $(function () { test('should fire hide event', function () { stop() - $('
    ') + var tooltip = $('
    ').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') @@ -155,12 +159,14 @@ $(function () { test('should fire hidden event', function () { stop() - $('
    ') + var tooltip = $('
    ').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') @@ -168,13 +174,15 @@ $(function () { test('should not fire hidden event when default prevented', function () { stop() - $('
    ') + var tooltip = $('
    ').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 () { -- cgit v1.2.3 From 21de05c8c09b0ff9c11651596a84442b312381bb Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 6 Jun 2014 15:34:56 -0700 Subject: don't show tooltips/popovers whose element isn't in the DOM; fixes #13268 --- js/tooltip.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/tooltip.js b/js/tooltip.js index 3b8ac17f6..b4ced6d2a 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -145,8 +145,9 @@ 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() -- cgit v1.2.3 From 0be41096888201831c151864c0ab05cf0b5ca734 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 29 May 2014 02:24:41 -0500 Subject: there is no need for this.offsets and this.targets to be jQuery objects --- js/scrollspy.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'js') diff --git a/js/scrollspy.js b/js/scrollspy.js index cddde45ad..de4f98707 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -24,8 +24,8 @@ this.selector = (this.options.target || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 || '') + ' .nav li > a' - this.offsets = $([]) - this.targets = $([]) + this.offsets = [] + this.targets = [] this.activeTarget = null this.refresh() @@ -41,8 +41,9 @@ ScrollSpy.prototype.refresh = function () { var offsetMethod = this.$element[0] == window ? 'offset' : 'position' - this.offsets = $([]) - this.targets = $([]) + this.offsets = [] + this.targets = [] + var self = this this.$body @@ -75,7 +76,7 @@ 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]) { -- cgit v1.2.3 From 632313d631b51d96557bb6576c0b41e33cbfb009 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 29 May 2014 02:30:18 -0500 Subject: no need to check for href attribute on the scrollable element --- js/scrollspy.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'js') diff --git a/js/scrollspy.js b/js/scrollspy.js index de4f98707..db493d7ed 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -14,16 +14,13 @@ // ========================== 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.options = $.extend({}, ScrollSpy.DEFAULTS, options) - this.selector = (this.options.target - || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7 - || '') + ' .nav li > a' + this.selector = (this.options.target || '') + ' .nav li > a' this.offsets = [] this.targets = [] this.activeTarget = null -- cgit v1.2.3 From bc8e6ffb7d702895296050d2fd8847fb5eed2381 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 29 May 2014 02:36:53 -0500 Subject: removing this.$element as it is a superfluous copy of this.$scrollElement --- js/scrollspy.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'js') diff --git a/js/scrollspy.js b/js/scrollspy.js index db493d7ed..94171bb1b 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -16,15 +16,15 @@ function ScrollSpy(element, options) { 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 || '') + ' .nav li > a' this.offsets = [] this.targets = [] this.activeTarget = null + this.$scrollElement.on('scroll.bs.scrollspy', process) this.refresh() this.process() } @@ -36,7 +36,7 @@ } ScrollSpy.prototype.refresh = function () { - var offsetMethod = this.$element[0] == window ? 'offset' : 'position' + var offsetMethod = this.$scrollElement[0] == window ? 'offset' : 'position' this.offsets = [] this.targets = [] -- cgit v1.2.3 From 1cfa902e313e848732976ac6e538f3f72c135d90 Mon Sep 17 00:00:00 2001 From: Mike Greiling Date: Thu, 29 May 2014 02:51:49 -0500 Subject: refactor scrollspy refresh method Closes #13702 by merging a rebased version of it. --- js/scrollspy.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'js') diff --git a/js/scrollspy.js b/js/scrollspy.js index 94171bb1b..644c65f94 100644 --- a/js/scrollspy.js +++ b/js/scrollspy.js @@ -36,7 +36,13 @@ } ScrollSpy.prototype.refresh = function () { - var offsetMethod = this.$scrollElement[0] == window ? 'offset' : 'position' + var offsetMethod = 'offset' + var offsetBase = 0 + + if (!$.isWindow(this.$scrollElement[0])) { + offsetMethod = 'position' + offsetBase = this.$scrollElement.scrollTop() + } this.offsets = [] this.targets = [] @@ -54,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 () { -- cgit v1.2.3