Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
B
bootstrap
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bootstrap
Commits
a34e52de
Commit
a34e52de
authored
Jul 06, 2014
by
Chris Rebert
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14015 from twbs/possible-14013-fix
Possible fix for #14013
parents
5830febd
f9ffb499
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
6 deletions
+16
-6
dist/js/bootstrap.js
dist/js/bootstrap.js
+6
-3
js/tooltip.js
js/tooltip.js
+10
-3
No files found.
dist/js/bootstrap.js
View file @
a34e52de
...
@@ -1418,11 +1418,14 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
...
@@ -1418,11 +1418,14 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
$element
=
$element
||
this
.
$element
$element
=
$element
||
this
.
$element
var
el
=
$element
[
0
]
var
el
=
$element
[
0
]
var
isBody
=
el
.
tagName
==
'
BODY
'
var
isBody
=
el
.
tagName
==
'
BODY
'
return
$
.
extend
({},
(
typeof
el
.
getBoundingClientRect
==
'
function
'
)
?
el
.
getBoundingClientRect
()
:
null
,
{
var
isSvg
=
window
.
SVGElement
&&
el
instanceof
window
.
SVGElement
scroll
:
isBody
?
document
.
documentElement
.
scrollTop
||
document
.
body
.
scrollTop
:
$element
.
scrollTop
(),
var
outerDims
=
isSvg
?
{}
:
{
width
:
isBody
?
$
(
window
).
width
()
:
$element
.
outerWidth
(),
width
:
isBody
?
$
(
window
).
width
()
:
$element
.
outerWidth
(),
height
:
isBody
?
$
(
window
).
height
()
:
$element
.
outerHeight
()
height
:
isBody
?
$
(
window
).
height
()
:
$element
.
outerHeight
()
},
isBody
?
{
top
:
0
,
left
:
0
}
:
$element
.
offset
())
}
return
$
.
extend
({},
(
typeof
el
.
getBoundingClientRect
==
'
function
'
)
?
el
.
getBoundingClientRect
()
:
null
,
{
scroll
:
isBody
?
document
.
documentElement
.
scrollTop
||
document
.
body
.
scrollTop
:
$element
.
scrollTop
()
},
outerDims
,
isBody
?
{
top
:
0
,
left
:
0
}
:
$element
.
offset
())
}
}
Tooltip
.
prototype
.
getCalculatedOffset
=
function
(
placement
,
pos
,
actualWidth
,
actualHeight
)
{
Tooltip
.
prototype
.
getCalculatedOffset
=
function
(
placement
,
pos
,
actualWidth
,
actualHeight
)
{
...
...
js/tooltip.js
View file @
a34e52de
...
@@ -316,13 +316,20 @@
...
@@ -316,13 +316,20 @@
Tooltip
.
prototype
.
getPosition
=
function
(
$element
)
{
Tooltip
.
prototype
.
getPosition
=
function
(
$element
)
{
$element
=
$element
||
this
.
$element
$element
=
$element
||
this
.
$element
var
el
=
$element
[
0
]
var
el
=
$element
[
0
]
var
isBody
=
el
.
tagName
==
'
BODY
'
var
isBody
=
el
.
tagName
==
'
BODY
'
return
$
.
extend
({},
(
typeof
el
.
getBoundingClientRect
==
'
function
'
)
?
el
.
getBoundingClientRect
()
:
null
,
{
var
isSvg
=
window
.
SVGElement
&&
el
instanceof
window
.
SVGElement
scroll
:
isBody
?
document
.
documentElement
.
scrollTop
||
document
.
body
.
scrollTop
:
$element
.
scrollTop
(),
var
elRect
=
typeof
el
.
getBoundingClientRect
==
'
function
'
?
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
?
{}
:
{
width
:
isBody
?
$
(
window
).
width
()
:
$element
.
outerWidth
(),
width
:
isBody
?
$
(
window
).
width
()
:
$element
.
outerWidth
(),
height
:
isBody
?
$
(
window
).
height
()
:
$element
.
outerHeight
()
height
:
isBody
?
$
(
window
).
height
()
:
$element
.
outerHeight
()
},
isBody
?
{
top
:
0
,
left
:
0
}
:
$element
.
offset
())
}
return
$
.
extend
({},
elRect
,
scroll
,
outerDims
,
elOffset
)
}
}
Tooltip
.
prototype
.
getCalculatedOffset
=
function
(
placement
,
pos
,
actualWidth
,
actualHeight
)
{
Tooltip
.
prototype
.
getCalculatedOffset
=
function
(
placement
,
pos
,
actualWidth
,
actualHeight
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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