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
6841c509
Commit
6841c509
authored
Jul 23, 2013
by
Jacob Thornton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes #7814
parent
faba6808
Changes
3
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
dist/js/bootstrap.js
dist/js/bootstrap.js
+5
-5
dist/js/bootstrap.min.js
dist/js/bootstrap.min.js
+1
-1
js/tooltip.js
js/tooltip.js
+4
-4
No files found.
dist/js/bootstrap.js
View file @
6841c509
...
...
@@ -683,7 +683,7 @@
if
(
!
isActive
)
{
if
(
'
ontouchstart
'
in
document
.
documentElement
)
{
// if mobile we we use a backdrop because click events don't delegate
$
(
'
<div class="dropdown-backdrop"/>
'
).
insert
Before
(
$
(
this
)).
on
(
'
click
'
,
clearMenus
)
$
(
'
<div class="dropdown-backdrop"/>
'
).
insert
After
(
$
(
this
)).
on
(
'
click
'
,
clearMenus
)
}
$parent
.
trigger
(
e
=
$
.
Event
(
'
show.bs.dropdown
'
))
...
...
@@ -1140,10 +1140,10 @@
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
show
)
return
self
.
show
()
clearTimeout
(
this
.
timeout
)
clearTimeout
(
self
.
timeout
)
self
.
hoverState
=
'
in
'
this
.
timeout
=
setTimeout
(
function
()
{
self
.
timeout
=
setTimeout
(
function
()
{
if
(
self
.
hoverState
==
'
in
'
)
self
.
show
()
},
self
.
options
.
delay
.
show
)
}
...
...
@@ -1152,12 +1152,12 @@
var
self
=
obj
instanceof
this
.
constructor
?
obj
:
$
(
obj
.
currentTarget
)[
this
.
type
](
this
.
_options
).
data
(
'
bs.
'
+
this
.
type
)
clearTimeout
(
this
.
timeout
)
clearTimeout
(
self
.
timeout
)
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
hide
)
return
self
.
hide
()
self
.
hoverState
=
'
out
'
this
.
timeout
=
setTimeout
(
function
()
{
self
.
timeout
=
setTimeout
(
function
()
{
if
(
self
.
hoverState
==
'
out
'
)
self
.
hide
()
},
self
.
options
.
delay
.
hide
)
}
...
...
dist/js/bootstrap.min.js
View file @
6841c509
This diff is collapsed.
Click to expand it.
js/tooltip.js
View file @
6841c509
...
...
@@ -104,10 +104,10 @@
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
show
)
return
self
.
show
()
clearTimeout
(
this
.
timeout
)
clearTimeout
(
self
.
timeout
)
self
.
hoverState
=
'
in
'
this
.
timeout
=
setTimeout
(
function
()
{
self
.
timeout
=
setTimeout
(
function
()
{
if
(
self
.
hoverState
==
'
in
'
)
self
.
show
()
},
self
.
options
.
delay
.
show
)
}
...
...
@@ -116,12 +116,12 @@
var
self
=
obj
instanceof
this
.
constructor
?
obj
:
$
(
obj
.
currentTarget
)[
this
.
type
](
this
.
_options
).
data
(
'
bs.
'
+
this
.
type
)
clearTimeout
(
this
.
timeout
)
clearTimeout
(
self
.
timeout
)
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
hide
)
return
self
.
hide
()
self
.
hoverState
=
'
out
'
this
.
timeout
=
setTimeout
(
function
()
{
self
.
timeout
=
setTimeout
(
function
()
{
if
(
self
.
hoverState
==
'
out
'
)
self
.
hide
()
},
self
.
options
.
delay
.
hide
)
}
...
...
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