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
01e0f8c6
Commit
01e0f8c6
authored
12 years ago
by
fat
Browse files
Options
Download
Email Patches
Plain Diff
only pass unique options through to child nodes in tooltips
parent
cf998040
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
docs/assets/js/bootstrap-tooltip.js
+10
-1
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap.js
+10
-1
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
+1
-1
docs/assets/js/bootstrap.min.js
js/bootstrap-tooltip.js
+9
-1
js/bootstrap-tooltip.js
with
30 additions
and
4 deletions
+30
-4
docs/assets/js/bootstrap-tooltip.js
+
10
-
1
View file @
01e0f8c6
...
@@ -80,7 +80,16 @@
...
@@ -80,7 +80,16 @@
}
}
,
enter
:
function
(
e
)
{
,
enter
:
function
(
e
)
{
var
self
=
$
(
e
.
currentTarget
)[
this
.
type
](
this
.
_options
).
data
(
this
.
type
)
var
defaults
=
$
.
fn
[
this
.
type
].
defaults
,
options
=
{}
,
self
this
.
_options
&&
$
.
each
(
this
.
_options
,
function
(
key
,
value
)
{
if
(
defaults
[
key
]
!=
value
)
options
[
key
]
=
value
},
this
)
self
=
$
(
e
.
currentTarget
)[
this
.
type
](
options
).
data
(
this
.
type
)
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
show
)
return
self
.
show
()
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
show
)
return
self
.
show
()
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.js
+
10
-
1
View file @
01e0f8c6
...
@@ -1125,7 +1125,16 @@
...
@@ -1125,7 +1125,16 @@
}
}
,
enter
:
function
(
e
)
{
,
enter
:
function
(
e
)
{
var
self
=
$
(
e
.
currentTarget
)[
this
.
type
](
this
.
_options
).
data
(
this
.
type
)
var
defaults
=
$
.
fn
[
this
.
type
].
defaults
,
options
=
{}
,
self
this
.
_options
&&
$
.
each
(
this
.
_options
,
function
(
key
,
value
)
{
if
(
defaults
[
key
]
!=
value
)
options
[
key
]
=
value
},
this
)
self
=
$
(
e
.
currentTarget
)[
this
.
type
](
options
).
data
(
this
.
type
)
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
show
)
return
self
.
show
()
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
show
)
return
self
.
show
()
...
...
This diff is collapsed.
Click to expand it.
docs/assets/js/bootstrap.min.js
+
1
-
1
View file @
01e0f8c6
This diff is collapsed.
Click to expand it.
js/bootstrap-tooltip.js
+
9
-
1
View file @
01e0f8c6
...
@@ -80,7 +80,15 @@
...
@@ -80,7 +80,15 @@
}
}
,
enter
:
function
(
e
)
{
,
enter
:
function
(
e
)
{
var
self
=
$
(
e
.
currentTarget
)[
this
.
type
](
this
.
_options
).
data
(
this
.
type
)
var
defaults
=
$
.
fn
[
this
.
type
].
defaults
,
options
=
{}
,
self
this
.
_options
&&
$
.
each
(
this
.
_options
,
function
(
key
,
value
)
{
if
(
defaults
[
key
]
!=
value
)
options
[
key
]
=
value
},
this
)
self
=
$
(
e
.
currentTarget
)[
this
.
type
](
options
).
data
(
this
.
type
)
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
show
)
return
self
.
show
()
if
(
!
self
.
options
.
delay
||
!
self
.
options
.
delay
.
show
)
return
self
.
show
()
...
...
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