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
1abb7947
Commit
1abb7947
authored
11 years ago
by
Jacob Thornton
Browse files
Options
Download
Email Patches
Plain Diff
fixes
#9222
parent
7998c455
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
dist/js/bootstrap.js
+11
-11
dist/js/bootstrap.js
dist/js/bootstrap.min.js
+1
-1
dist/js/bootstrap.min.js
js/popover.js
+1
-5
js/popover.js
js/tooltip.js
+10
-6
js/tooltip.js
with
23 additions
and
23 deletions
+23
-23
dist/js/bootstrap.js
+
11
-
11
View file @
1abb7947
...
@@ -1133,7 +1133,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
...
@@ -1133,7 +1133,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
var
eventIn
=
trigger
==
'
hover
'
?
'
mouseenter
'
:
'
focus
'
var
eventIn
=
trigger
==
'
hover
'
?
'
mouseenter
'
:
'
focus
'
var
eventOut
=
trigger
==
'
hover
'
?
'
mouseleave
'
:
'
blur
'
var
eventOut
=
trigger
==
'
hover
'
?
'
mouseleave
'
:
'
blur
'
this
.
$element
.
on
(
eventIn
+
'
.
'
+
this
.
type
,
this
.
options
.
selector
,
$
.
proxy
(
this
.
enter
,
this
))
this
.
$element
.
on
(
eventIn
+
'
.
'
+
this
.
type
,
this
.
options
.
selector
,
$
.
proxy
(
this
.
enter
,
this
))
this
.
$element
.
on
(
eventOut
+
'
.
'
+
this
.
type
,
this
.
options
.
selector
,
$
.
proxy
(
this
.
leave
,
this
))
this
.
$element
.
on
(
eventOut
+
'
.
'
+
this
.
type
,
this
.
options
.
selector
,
$
.
proxy
(
this
.
leave
,
this
))
}
}
}
}
...
@@ -1160,16 +1160,20 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
...
@@ -1160,16 +1160,20 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
return
options
return
options
}
}
Tooltip
.
prototype
.
enter
=
function
(
obj
)
{
Tooltip
.
prototype
.
getDelegateOptions
=
function
()
{
var
defaults
=
this
.
getDefaults
()
var
options
=
{}
var
options
=
{}
var
defaults
=
this
.
getDefaults
()
this
.
_options
&&
$
.
each
(
this
.
_options
,
function
(
key
,
value
)
{
this
.
_options
&&
$
.
each
(
this
.
_options
,
function
(
key
,
value
)
{
if
(
defaults
[
key
]
!=
value
)
options
[
key
]
=
value
if
(
defaults
[
key
]
!=
value
)
options
[
key
]
=
value
})
})
return
options
}
Tooltip
.
prototype
.
enter
=
function
(
obj
)
{
var
self
=
obj
instanceof
this
.
constructor
?
var
self
=
obj
instanceof
this
.
constructor
?
obj
:
$
(
obj
.
currentTarget
)[
this
.
type
](
o
ptions
).
data
(
'
bs.
'
+
this
.
type
)
obj
:
$
(
obj
.
currentTarget
)[
this
.
type
](
this
.
getDelegateO
ptions
()
).
data
(
'
bs.
'
+
this
.
type
)
clearTimeout
(
self
.
timeout
)
clearTimeout
(
self
.
timeout
)
...
@@ -1183,7 +1187,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
...
@@ -1183,7 +1187,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
Tooltip
.
prototype
.
leave
=
function
(
obj
)
{
Tooltip
.
prototype
.
leave
=
function
(
obj
)
{
var
self
=
obj
instanceof
this
.
constructor
?
var
self
=
obj
instanceof
this
.
constructor
?
obj
:
$
(
obj
.
currentTarget
)[
this
.
type
](
this
.
_o
ptions
).
data
(
'
bs.
'
+
this
.
type
)
obj
:
$
(
obj
.
currentTarget
)[
this
.
type
](
this
.
getDelegateO
ptions
()
).
data
(
'
bs.
'
+
this
.
type
)
clearTimeout
(
self
.
timeout
)
clearTimeout
(
self
.
timeout
)
...
@@ -1408,7 +1412,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
...
@@ -1408,7 +1412,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
}
}
Tooltip
.
prototype
.
toggle
=
function
(
e
)
{
Tooltip
.
prototype
.
toggle
=
function
(
e
)
{
var
self
=
e
?
$
(
e
.
currentTarget
)[
this
.
type
](
this
.
_o
ptions
).
data
(
'
bs.
'
+
this
.
type
)
:
this
var
self
=
e
?
$
(
e
.
currentTarget
)[
this
.
type
](
this
.
getDelegateO
ptions
()
).
data
(
'
bs.
'
+
this
.
type
)
:
this
self
.
tip
().
hasClass
(
'
in
'
)
?
self
.
leave
(
self
)
:
self
.
enter
(
self
)
self
.
tip
().
hasClass
(
'
in
'
)
?
self
.
leave
(
self
)
:
self
.
enter
(
self
)
}
}
...
@@ -1506,13 +1510,9 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
...
@@ -1506,13 +1510,9 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
$tip
.
removeClass
(
'
fade top bottom left right in
'
)
$tip
.
removeClass
(
'
fade top bottom left right in
'
)
// Hide empty titles
//
// IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
// IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
// this manually by checking the contents.
// this manually by checking the contents.
if
(
$tip
.
find
(
'
.popover-title
'
).
html
()
===
''
)
{
if
(
!
$tip
.
find
(
'
.popover-title
'
).
html
())
$tip
.
find
(
'
.popover-title
'
).
hide
()
$tip
.
find
(
'
.popover-title
'
).
hide
();
}
}
}
Popover
.
prototype
.
hasContent
=
function
()
{
Popover
.
prototype
.
hasContent
=
function
()
{
...
...
This diff is collapsed.
Click to expand it.
dist/js/bootstrap.min.js
+
1
-
1
View file @
1abb7947
This diff is collapsed.
Click to expand it.
js/popover.js
+
1
-
5
View file @
1abb7947
...
@@ -58,13 +58,9 @@
...
@@ -58,13 +58,9 @@
$tip
.
removeClass
(
'
fade top bottom left right in
'
)
$tip
.
removeClass
(
'
fade top bottom left right in
'
)
// Hide empty titles
//
// IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
// IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
// this manually by checking the contents.
// this manually by checking the contents.
if
(
$tip
.
find
(
'
.popover-title
'
).
html
()
===
''
)
{
if
(
!
$tip
.
find
(
'
.popover-title
'
).
html
())
$tip
.
find
(
'
.popover-title
'
).
hide
()
$tip
.
find
(
'
.popover-title
'
).
hide
();
}
}
}
Popover
.
prototype
.
hasContent
=
function
()
{
Popover
.
prototype
.
hasContent
=
function
()
{
...
...
This diff is collapsed.
Click to expand it.
js/tooltip.js
+
10
-
6
View file @
1abb7947
...
@@ -64,7 +64,7 @@
...
@@ -64,7 +64,7 @@
var
eventIn
=
trigger
==
'
hover
'
?
'
mouseenter
'
:
'
focus
'
var
eventIn
=
trigger
==
'
hover
'
?
'
mouseenter
'
:
'
focus
'
var
eventOut
=
trigger
==
'
hover
'
?
'
mouseleave
'
:
'
blur
'
var
eventOut
=
trigger
==
'
hover
'
?
'
mouseleave
'
:
'
blur
'
this
.
$element
.
on
(
eventIn
+
'
.
'
+
this
.
type
,
this
.
options
.
selector
,
$
.
proxy
(
this
.
enter
,
this
))
this
.
$element
.
on
(
eventIn
+
'
.
'
+
this
.
type
,
this
.
options
.
selector
,
$
.
proxy
(
this
.
enter
,
this
))
this
.
$element
.
on
(
eventOut
+
'
.
'
+
this
.
type
,
this
.
options
.
selector
,
$
.
proxy
(
this
.
leave
,
this
))
this
.
$element
.
on
(
eventOut
+
'
.
'
+
this
.
type
,
this
.
options
.
selector
,
$
.
proxy
(
this
.
leave
,
this
))
}
}
}
}
...
@@ -91,16 +91,20 @@
...
@@ -91,16 +91,20 @@
return
options
return
options
}
}
Tooltip
.
prototype
.
enter
=
function
(
obj
)
{
Tooltip
.
prototype
.
getDelegateOptions
=
function
()
{
var
defaults
=
this
.
getDefaults
()
var
options
=
{}
var
options
=
{}
var
defaults
=
this
.
getDefaults
()
this
.
_options
&&
$
.
each
(
this
.
_options
,
function
(
key
,
value
)
{
this
.
_options
&&
$
.
each
(
this
.
_options
,
function
(
key
,
value
)
{
if
(
defaults
[
key
]
!=
value
)
options
[
key
]
=
value
if
(
defaults
[
key
]
!=
value
)
options
[
key
]
=
value
})
})
return
options
}
Tooltip
.
prototype
.
enter
=
function
(
obj
)
{
var
self
=
obj
instanceof
this
.
constructor
?
var
self
=
obj
instanceof
this
.
constructor
?
obj
:
$
(
obj
.
currentTarget
)[
this
.
type
](
o
ptions
).
data
(
'
bs.
'
+
this
.
type
)
obj
:
$
(
obj
.
currentTarget
)[
this
.
type
](
this
.
getDelegateO
ptions
()
).
data
(
'
bs.
'
+
this
.
type
)
clearTimeout
(
self
.
timeout
)
clearTimeout
(
self
.
timeout
)
...
@@ -114,7 +118,7 @@
...
@@ -114,7 +118,7 @@
Tooltip
.
prototype
.
leave
=
function
(
obj
)
{
Tooltip
.
prototype
.
leave
=
function
(
obj
)
{
var
self
=
obj
instanceof
this
.
constructor
?
var
self
=
obj
instanceof
this
.
constructor
?
obj
:
$
(
obj
.
currentTarget
)[
this
.
type
](
this
.
_o
ptions
).
data
(
'
bs.
'
+
this
.
type
)
obj
:
$
(
obj
.
currentTarget
)[
this
.
type
](
this
.
getDelegateO
ptions
()
).
data
(
'
bs.
'
+
this
.
type
)
clearTimeout
(
self
.
timeout
)
clearTimeout
(
self
.
timeout
)
...
@@ -339,7 +343,7 @@
...
@@ -339,7 +343,7 @@
}
}
Tooltip
.
prototype
.
toggle
=
function
(
e
)
{
Tooltip
.
prototype
.
toggle
=
function
(
e
)
{
var
self
=
e
?
$
(
e
.
currentTarget
)[
this
.
type
](
this
.
_o
ptions
).
data
(
'
bs.
'
+
this
.
type
)
:
this
var
self
=
e
?
$
(
e
.
currentTarget
)[
this
.
type
](
this
.
getDelegateO
ptions
()
).
data
(
'
bs.
'
+
this
.
type
)
:
this
self
.
tip
().
hasClass
(
'
in
'
)
?
self
.
leave
(
self
)
:
self
.
enter
(
self
)
self
.
tip
().
hasClass
(
'
in
'
)
?
self
.
leave
(
self
)
:
self
.
enter
(
self
)
}
}
...
...
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