Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Bootstrap
bootstrap
Commits
42fbcfda
Commit
42fbcfda
authored
10 years ago
by
Chris Rebert
Browse files
Options
Download
Plain Diff
Merge pull request #14090 from hnrch02/unit-tests-ie8
Fix IE8 problems with unit tests
parents
31373309
1719d2b0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
js/tests/unit/collapse.js
+2
-2
js/tests/unit/collapse.js
js/tests/unit/tooltip.js
+6
-6
js/tests/unit/tooltip.js
js/tooltip.js
+1
-1
js/tooltip.js
with
9 additions
and
9 deletions
+9
-9
js/tests/unit/collapse.js
+
2
-
2
View file @
42fbcfda
...
...
@@ -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
()
{
...
...
This diff is collapsed.
Click to expand it.
js/tests/unit/tooltip.js
+
6
-
6
View file @
42fbcfda
...
...
@@ -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;"/>
'
)
...
...
This diff is collapsed.
Click to expand it.
js/tooltip.js
+
1
-
1
View file @
42fbcfda
...
...
@@ -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
?
{}
:
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment