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/tooltip.js | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'js/tests/unit/tooltip.js') 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') -- 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 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) (limited to 'js/tests/unit/tooltip.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 = $('') -- 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/tests/unit/tooltip.js | 127 ++++++++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 63 deletions(-) (limited to 'js/tests/unit/tooltip.js') 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() -- 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/tests/unit/tooltip.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'js/tests/unit/tooltip.js') 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') -- 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/tests/unit/tooltip.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/tests/unit/tooltip.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