diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js index 976bdcd7bf..8e6bb82736 100644 --- a/js/tests/unit/collapse.js +++ b/js/tests/unit/collapse.js @@ -33,14 +33,14 @@ $(function () { var $el = $('
').bootstrapCollapse('show') ok($el.hasClass('in'), 'has class "in"') - ok(!/height/.test($el.attr('style')), 'has height reset') + ok(!/height/i.test($el.attr('style')), 'has height reset') }) test('should hide a collapsed element', function () { var $el = $('').bootstrapCollapse('hide') ok(!$el.hasClass('in'), 'does not have class "in"') - ok(/height/.test($el.attr('style')), 'has height set') + ok(/height/i.test($el.attr('style')), 'has height set') }) test('should not fire shown when show is prevented', function () { diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index 4cecf9348e..6871f538e3 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -470,7 +470,7 @@ $(function () { + '.tooltip.right { white-space: nowrap; }' + '.tooltip.right .tooltip-inner { max-width: none; }' + '' - var $styles = $(styles).appendTo(document.head) + var $styles = $(styles).appendTo('head') var $container = $('').appendTo(document.body) var $target = $('') @@ -585,7 +585,7 @@ $(function () { + '.tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; }' + 'a[rel="tooltip"] { position: fixed; }' + '' - var $styles = $(styles).appendTo(document.head) + var $styles = $(styles).appendTo('head') var $container = $('').appendTo(document.body) var $target = $('') @@ -613,7 +613,7 @@ $(function () { + '.tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; }' + 'a[rel="tooltip"] { position: fixed; }' + '' - var $styles = $(styles).appendTo(document.head) + var $styles = $(styles).appendTo('head') var $container = $('').appendTo(document.body) var $target = $('') @@ -642,7 +642,7 @@ $(function () { + '.tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; }' + 'a[rel="tooltip"] { position: fixed; }' + '' - var $styles = $(styles).appendTo(document.head) + var $styles = $(styles).appendTo('head') var $container = $('').appendTo(document.body) var $target = $('') @@ -670,7 +670,7 @@ $(function () { + '.tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; }' + 'a[rel="tooltip"] { position: fixed; }' + '' - var $styles = $(styles).appendTo(document.head) + var $styles = $(styles).appendTo('head') var $container = $('').appendTo('body') var $target = $('') @@ -700,7 +700,7 @@ $(function () { + '.container-viewport { position: absolute; top: 50px; left: 60px; width: 300px; height: 300px; }' + 'a[rel="tooltip"] { position: fixed; }' + '' - var $styles = $(styles).appendTo(document.head) + var $styles = $(styles).appendTo('head') var $container = $('').appendTo(document.body) var $target = $('') diff --git a/js/tooltip.js b/js/tooltip.js index b305bc5ab5..0c3a79d0b9 100644 --- a/js/tooltip.js +++ b/js/tooltip.js @@ -321,7 +321,7 @@ var isBody = el.tagName == 'BODY' var isSvg = window.SVGElement && el instanceof window.SVGElement - var elRect = typeof el.getBoundingClientRect == 'function' ? el.getBoundingClientRect() : null + var elRect = el.getBoundingClientRect ? el.getBoundingClientRect() : null var elOffset = isBody ? { top: 0, left: 0 } : $element.offset() var scroll = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() } var outerDims = isSvg ? {} : {