diff options
| author | Chris Rebert <[email protected]> | 2014-07-08 16:17:16 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-07-08 16:17:16 -0700 |
| commit | 42fbcfdaef67970dae200d06957b1eb90fd84921 (patch) | |
| tree | d30118e2ce3b2e122a2f23dd0165758278d85019 | |
| parent | 31373309a5ac2fb295cca21ba204e2e9a73fb640 (diff) | |
| parent | 1719d2b0516ef17afca36fc95249a10e8f3bd136 (diff) | |
| download | bootstrap-42fbcfdaef67970dae200d06957b1eb90fd84921.tar.xz bootstrap-42fbcfdaef67970dae200d06957b1eb90fd84921.zip | |
Merge pull request #14090 from hnrch02/unit-tests-ie8
Fix IE8 problems with unit tests
| -rw-r--r-- | js/tests/unit/collapse.js | 4 | ||||
| -rw-r--r-- | js/tests/unit/tooltip.js | 12 | ||||
| -rw-r--r-- | js/tooltip.js | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/js/tests/unit/collapse.js b/js/tests/unit/collapse.js index 976bdcd7b..8e6bb8273 100644 --- a/js/tests/unit/collapse.js +++ b/js/tests/unit/collapse.js @@ -33,14 +33,14 @@ $(function () { var $el = $('<div class="collapse"/>').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 = $('<div class="collapse"/>').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 4cecf9348..6871f538e 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; }' + '</style>' - var $styles = $(styles).appendTo(document.head) + var $styles = $(styles).appendTo('head') var $container = $('<div/>').appendTo(document.body) var $target = $('<a href="#" rel="tooltip" title="very very very very very very very very long tooltip in one line"/>') @@ -585,7 +585,7 @@ $(function () { + '.tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; }' + 'a[rel="tooltip"] { position: fixed; }' + '</style>' - var $styles = $(styles).appendTo(document.head) + var $styles = $(styles).appendTo('head') var $container = $('<div/>').appendTo(document.body) var $target = $('<a href="#" rel="tooltip" title="tip" style="top: 0px; left: 0px;"/>') @@ -613,7 +613,7 @@ $(function () { + '.tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; }' + 'a[rel="tooltip"] { position: fixed; }' + '</style>' - var $styles = $(styles).appendTo(document.head) + var $styles = $(styles).appendTo('head') var $container = $('<div/>').appendTo(document.body) var $target = $('<a href="#" rel="tooltip" title="tip" style="bottom: 0px; left: 0px;"/>') @@ -642,7 +642,7 @@ $(function () { + '.tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; }' + 'a[rel="tooltip"] { position: fixed; }' + '</style>' - var $styles = $(styles).appendTo(document.head) + var $styles = $(styles).appendTo('head') var $container = $('<div/>').appendTo(document.body) var $target = $('<a href="#" rel="tooltip" title="tip" style="top: 0px; left: 0px;"/>') @@ -670,7 +670,7 @@ $(function () { + '.tooltip .tooltip-inner { width: 200px; height: 200px; max-width: none; }' + 'a[rel="tooltip"] { position: fixed; }' + '</style>' - var $styles = $(styles).appendTo(document.head) + var $styles = $(styles).appendTo('head') var $container = $('<div/>').appendTo('body') var $target = $('<a href="#" rel="tooltip" title="tip" style="top: 0px; right: 0px;"/>') @@ -700,7 +700,7 @@ $(function () { + '.container-viewport { position: absolute; top: 50px; left: 60px; width: 300px; height: 300px; }' + 'a[rel="tooltip"] { position: fixed; }' + '</style>' - var $styles = $(styles).appendTo(document.head) + var $styles = $(styles).appendTo('head') var $container = $('<div class="container-viewport"/>').appendTo(document.body) var $target = $('<a href="#" rel="tooltip" title="tip" style="top: 50px; left: 350px;"/>') diff --git a/js/tooltip.js b/js/tooltip.js index b305bc5ab..0c3a79d0b 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 ? {} : { |
