From 78c18954a86fb81e29eabdace2659ab4ee3a521a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 23 Apr 2015 16:27:03 -0700 Subject: [PATCH 1/6] _reboot.scss: fix typo in comment --- scss/_reboot.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/_reboot.scss b/scss/_reboot.scss index dd03174f34..16e9603f31 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -243,7 +243,7 @@ textarea { margin: 0; // Normalize includes `font: inherit;`, so `font-family`. `font-size`, etc are // properly inherited. However, `line-height` isn't addressed there. Using this - // ensures we don't need to unnessarily redeclare the global font stack. + // ensures we don't need to unnecessarily redeclare the global font stack. line-height: inherit; } From cfcc597c85cd354fda8f6f34005d7542d11236c0 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 23 Apr 2015 16:30:12 -0700 Subject: [PATCH 2/6] reboot.md: fix typo --- docs/components/reboot.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components/reboot.md b/docs/components/reboot.md index d41e4e303c..baed24d1ec 100644 --- a/docs/components/reboot.md +++ b/docs/components/reboot.md @@ -118,7 +118,7 @@ Tables are slightly adjusted to style ``s and ensure consistent `text-a
From 0d77644fc4de0865eebba1ffe04825267df3b8f3 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 16 Dec 2014 16:40:54 -0800 Subject: [PATCH 3/6] throw error when trying to show tooltip on :hidden element --- js/tests/unit/popover.js | 14 ++++++- js/tests/unit/tooltip.js | 80 +++++++++++++++++++++++----------------- js/tooltip.js | 8 ++++ 3 files changed, 68 insertions(+), 34 deletions(-) diff --git a/js/tests/unit/popover.js b/js/tests/unit/popover.js index 2cbc701387..68525540a5 100644 --- a/js/tests/unit/popover.js +++ b/js/tests/unit/popover.js @@ -166,7 +166,8 @@ $(function () { QUnit.test('should destroy popover', function (assert) { assert.expect(7) - var $popover = $('
') + var $popover = $('
Popover trigger
') + .appendTo('#qunit-fixture') .bootstrapPopover({ trigger: 'hover' }) @@ -240,6 +241,17 @@ $(function () { .bootstrapPopover('show') }) + QUnit.test('should throw an error when trying to show a popover on a hidden element', function (assert) { + assert.expect(1) + var $target = $('I am hidden').appendTo('#qunit-fixture') + + assert.throws(function () { + $target.bootstrapPopover('show') + }, new Error('Can\'t show a tooltip/popover on a hidden element')) + + $target.remove() + }) + QUnit.test('should throw an error when initializing popover on the document object without specifying a delegation selector', function (assert) { assert.expect(1) assert.throws(function () { diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index 2b63a3b48c..e1205b4c0f 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -44,7 +44,7 @@ $(function () { }) test('should add aria-describedby to the trigger on show', function () { - var $trigger = $('') + var $trigger = $('Tooltip trigger') .bootstrapTooltip() .appendTo('#qunit-fixture') .bootstrapTooltip('show') @@ -57,7 +57,7 @@ $(function () { }) test('should remove aria-describedby from trigger on hide', function () { - var $trigger = $('') + var $trigger = $('Tooltip trigger') .bootstrapTooltip() .appendTo('#qunit-fixture') @@ -69,7 +69,7 @@ $(function () { }) test('should assign a unique id tooltip element', function () { - $('') + $('Tooltip trigger') .appendTo('#qunit-fixture') .bootstrapTooltip('show') @@ -80,7 +80,7 @@ $(function () { }) test('should place tooltips relative to placement option', function () { - var $tooltip = $('') + var $tooltip = $('Tooltip trigger') .appendTo('#qunit-fixture') .bootstrapTooltip({ placement: 'bottom' }) @@ -92,7 +92,7 @@ $(function () { }) test('should allow html entities', function () { - var $tooltip = $('') + var $tooltip = $('Tooltip trigger') .appendTo('#qunit-fixture') .bootstrapTooltip({ html: true }) @@ -104,7 +104,7 @@ $(function () { }) test('should respect custom classes', function () { - var $tooltip = $('') + var $tooltip = $('Tooltip trigger') .appendTo('#qunit-fixture') .bootstrapTooltip({ template: '
' }) @@ -118,7 +118,8 @@ $(function () { test('should fire show event', function (assert) { var done = assert.async() - $('
') + $('
Tooltip trigger
') + .appendTo('#qunit-fixture') .on('show.bs.tooltip', function () { ok(true, 'show event fired') done() @@ -129,7 +130,7 @@ $(function () { test('should fire shown event', function (assert) { var done = assert.async() - $('
') + $('
Tooltip trigger
') .appendTo('#qunit-fixture') .on('shown.bs.tooltip', function () { ok(true, 'shown was called') @@ -141,7 +142,8 @@ $(function () { test('should not fire shown event when show was prevented', function (assert) { var done = assert.async() - $('
') + $('
Tooltip trigger
') + .appendTo('#qunit-fixture') .on('show.bs.tooltip', function (e) { e.preventDefault() ok(true, 'show event fired') @@ -156,7 +158,7 @@ $(function () { test('should fire hide event', function (assert) { var done = assert.async() - $('
') + $('
Tooltip trigger
') .appendTo('#qunit-fixture') .on('shown.bs.tooltip', function () { $(this).bootstrapTooltip('hide') @@ -171,7 +173,7 @@ $(function () { test('should fire hidden event', function (assert) { var done = assert.async() - $('
') + $('
Tooltip trigger
') .appendTo('#qunit-fixture') .on('shown.bs.tooltip', function () { $(this).bootstrapTooltip('hide') @@ -186,7 +188,7 @@ $(function () { test('should not fire hidden event when hide was prevented', function (assert) { var done = assert.async() - $('
') + $('
Tooltip trigger
') .appendTo('#qunit-fixture') .on('shown.bs.tooltip', function () { $(this).bootstrapTooltip('hide') @@ -203,7 +205,8 @@ $(function () { }) test('should destroy tooltip', function () { - var $tooltip = $('
') + var $tooltip = $('
Tooltip trigger
') + .appendTo('#qunit-fixture') .bootstrapTooltip() .on('click.foo', function () {}) @@ -221,7 +224,7 @@ $(function () { }) test('should show tooltip with delegate selector on click', function () { - var $div = $('
') + var $div = $('') .appendTo('#qunit-fixture') .bootstrapTooltip({ selector: 'a[rel="tooltip"]', @@ -236,7 +239,7 @@ $(function () { }) test('should show tooltip when toggle is called', function () { - $('') + $('Tooltip trigger') .appendTo('#qunit-fixture') .bootstrapTooltip({ trigger: 'manual' }) .bootstrapTooltip('toggle') @@ -255,7 +258,7 @@ $(function () { }) test('should place tooltips inside body when container is body', function () { - var $tooltip = $('') + var $tooltip = $('Tooltip trigger') .appendTo('#qunit-fixture') .bootstrapTooltip({ container: 'body' }) .bootstrapTooltip('show') @@ -275,7 +278,7 @@ $(function () { var $styles = $(styles).appendTo('head') var $container = $('
').appendTo('#qunit-fixture') - var $target = $('') + var $target = $('m') .appendTo($container) .bootstrapTooltip({ placement: 'right', @@ -296,7 +299,7 @@ $(function () { }) test('should use title attribute for tooltip text', function () { - var $tooltip = $('') + var $tooltip = $('Tooltip trigger') .appendTo('#qunit-fixture') .bootstrapTooltip() @@ -308,7 +311,7 @@ $(function () { }) test('should prefer title attribute over title option', function () { - var $tooltip = $('') + var $tooltip = $('Tooltip trigger') .appendTo('#qunit-fixture') .bootstrapTooltip({ title: 'This is a tooltip with some content' @@ -322,7 +325,7 @@ $(function () { }) test('should use title option', function () { - var $tooltip = $('') + var $tooltip = $('Tooltip trigger') .appendTo('#qunit-fixture') .bootstrapTooltip({ title: 'This is a tooltip with some content' @@ -548,7 +551,7 @@ $(function () { var $styles = $(styles).appendTo('head') var $container = $('
').appendTo('#qunit-fixture') - var $target = $('') + var $target = $('m') .appendTo($container) .bootstrapTooltip({ placement: 'right', @@ -575,7 +578,7 @@ $(function () { var $styles = $(styles).appendTo('head') var $container = $('
').appendTo('#qunit-fixture') - var $target = $('') + var $target = $('m') .appendTo($container) .bootstrapTooltip({ placement: 'right', @@ -604,7 +607,7 @@ $(function () { var $styles = $(styles).appendTo('head') var $container = $('
').appendTo('#qunit-fixture') - var $target = $('') + var $target = $('m') .appendTo($container) .bootstrapTooltip({ placement: 'bottom', @@ -632,7 +635,7 @@ $(function () { var $styles = $(styles).appendTo('head') var $container = $('
').appendTo('body') - var $target = $('') + var $target = $('m') .appendTo($container) .bootstrapTooltip({ placement: 'bottom', @@ -662,7 +665,7 @@ $(function () { var $styles = $(styles).appendTo('head') var $container = $('
').appendTo(document.body) - var $target = $('') + var $target = $('m') .appendTo($container) .bootstrapTooltip({ placement: 'bottom', @@ -682,7 +685,7 @@ $(function () { test('should not error when trying to show an auto-placed tooltip that has been removed from the dom', function () { var passed = true - var $tooltip = $('') + var $tooltip = $('Tooltip trigger') .appendTo('#qunit-fixture') .one('show.bs.tooltip', function () { $(this).remove() @@ -770,7 +773,7 @@ $(function () { test('should show tooltip if leave event hasn\'t occurred before delay expires', function (assert) { var done = assert.async() - var $tooltip = $('') + var $tooltip = $('Tooltip trigger') .appendTo('#qunit-fixture') .bootstrapTooltip({ delay: 150 }) @@ -789,7 +792,7 @@ $(function () { test('should not show tooltip if leave event occurs before delay expires', function (assert) { var done = assert.async() - var $tooltip = $('') + var $tooltip = $('Tooltip trigger') .appendTo('#qunit-fixture') .bootstrapTooltip({ delay: 150 }) @@ -809,7 +812,7 @@ $(function () { test('should not hide tooltip if leave event occurs and enter event occurs within the hide delay', function (assert) { var done = assert.async() - var $tooltip = $('') + var $tooltip = $('Tooltip trigger') .appendTo('#qunit-fixture') .bootstrapTooltip({ delay: { show: 0, hide: 150 }}) @@ -834,7 +837,7 @@ $(function () { test('should not show tooltip if leave event occurs before delay expires', function (assert) { var done = assert.async() - var $tooltip = $('') + var $tooltip = $('Tooltip trigger') .appendTo('#qunit-fixture') .bootstrapTooltip({ delay: 150 }) @@ -854,7 +857,7 @@ $(function () { test('should not show tooltip if leave event occurs before delay expires, even if hide delay is 0', function (assert) { var done = assert.async() - var $tooltip = $('') + var $tooltip = $('Tooltip trigger') .appendTo('#qunit-fixture') .bootstrapTooltip({ delay: { show: 150, hide: 0 }}) @@ -874,7 +877,7 @@ $(function () { test('should wait 200ms before hiding the tooltip', function (assert) { var done = assert.async() - var $tooltip = $('') + var $tooltip = $('Tooltip trigger') .appendTo('#qunit-fixture') .bootstrapTooltip({ delay: { show: 0, hide: 150 }}) @@ -1089,7 +1092,7 @@ $(function () { + '' var $styles = $(styles).appendTo('head') - var $element = $('
').appendTo('#qunit-fixture') + var $element = $('
').appendTo('#qunit-fixture') $element .on('shown.bs.tooltip', function () { @@ -1109,4 +1112,15 @@ $(function () { $element.bootstrapTooltip('show') }) + QUnit.test('should throw an error when trying to show a tooltip on a hidden element', function (assert) { + assert.expect(1) + var $target = $('I am hidden').appendTo('#qunit-fixture') + + assert.throws(function () { + $target.bootstrapTooltip('show') + }, new Error('Can\'t show a tooltip/popover on a hidden element')) + + $target.remove() + }) + }) diff --git a/js/tooltip.js b/js/tooltip.js index ced0e9282f..c787c6820f 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -293,6 +293,14 @@ Tooltip.prototype['destroy'] = function () { * and replace with external lib */ Tooltip.prototype['show'] = function () { + // jQuery's :hidden gives false positives for SVG elements + // See https://github.com/jquery/jquery/pull/939 + // Since this hiddenness check is just a nicety anyway, simply assume SVGs are always visible. + var isHidden = $(this.element).is(':hidden') && !(window.SVGElement && this.element instanceof window.SVGElement) + if (isHidden) { + throw new Error('Can\'t show a tooltip/popover on a hidden element') + } + var showEvent = $.Event(this.getEventObject().SHOW) if (this.isWithContent() && this._isEnabled) { From ff85ad1472437a04c29ad7092a423f0c284f74ae Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 23 Apr 2015 17:17:48 -0700 Subject: [PATCH 4/6] card.md: fix typo --- docs/components/card.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components/card.md b/docs/components/card.md index 715c5eb3e5..2dfc68c840 100644 --- a/docs/components/card.md +++ b/docs/components/card.md @@ -21,7 +21,7 @@ Cards require very little markup, but do require some additional classes to give ### Sizing -Cards are block-leve by default, so they'll fill the available horizontal space. Constrain their widths via custom styles, our predefined grid classes, or our grid mixins. +Cards are block-level by default, so they'll fill the available horizontal space. Constrain their widths via custom styles, our predefined grid classes, or our grid mixins. {% example html %}
From 4c3c402b0ec9295ac4630d3583e592a21264582e Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 23 Apr 2015 17:33:35 -0700 Subject: [PATCH 5/6] forms.md: fix typo --- docs/components/forms.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/components/forms.md b/docs/components/forms.md index 827912cb54..bf72dbd3cb 100644 --- a/docs/components/forms.md +++ b/docs/components/forms.md @@ -185,7 +185,7 @@ Use the `.inline-form` class to to display a series of labels, form controls, an - Controls receive `width: auto` to override the Bootstrap default `width: 100%`. - Controls **only appear inline in viewports that are at least 768px wide** to account for narrow viewports on mobile devices. -Because of this, you may need to manually adddres the width and alignment of individual form controls. Lastly, as shown below, you should always include a `
- This is an example table, and this is it's caption to describe the contents. + This is an example table, and this is its caption to describe the contents.