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
2ee9b271
Commit
2ee9b271
authored
Jul 16, 2012
by
Jon Stevens
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
namespace the events for popover/tooltip so that they can be cleanly removed. issue #3880
parent
40ab9283
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
8 deletions
+26
-8
docs/templates/pages/javascript.mustache
docs/templates/pages/javascript.mustache
+12
-0
js/bootstrap-popover.js
js/bootstrap-popover.js
+2
-1
js/bootstrap-tooltip.js
js/bootstrap-tooltip.js
+4
-3
js/tests/unit/bootstrap-popover.js
js/tests/unit/bootstrap-popover.js
+4
-2
js/tests/unit/bootstrap-tooltip.js
js/tests/unit/bootstrap-tooltip.js
+4
-2
No files found.
docs/templates/pages/javascript.mustache
View file @
2ee9b271
...
...
@@ -754,6 +754,12 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<p>
{{
_i
}}
Object structure is:
<code>
delay: { show: 500, hide: 100 }
</code>
{{/
i
}}
</p>
</td>
</tr>
<tr>
<td>
{{
_i
}}
ns
{{/
i
}}
</td>
<td>
{{
_i
}}
string
{{/
i
}}
</td>
<td>
'.tooltip'
</td>
<td>
{{
_i
}}
jQuery event namespace
{{/
i
}}
</td>
</tr>
</tbody>
</table>
<div
class=
"alert alert-info"
>
...
...
@@ -912,6 +918,12 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<p>
{{
_i
}}
Object structure is:
<code>
delay: { show: 500, hide: 100 }
</code>
{{/
i
}}
</p>
</td>
</tr>
<tr>
<td>
{{
_i
}}
ns
{{/
i
}}
</td>
<td>
{{
_i
}}
string
{{/
i
}}
</td>
<td>
'.popover'
</td>
<td>
{{
_i
}}
jQuery event namespace
{{/
i
}}
</td>
</tr>
</tbody>
</table>
<div
class=
"alert alert-info"
>
...
...
js/bootstrap-popover.js
View file @
2ee9b271
...
...
@@ -72,7 +72,7 @@
}
,
destroy
:
function
()
{
this
.
$element
.
off
().
removeData
(
'
popover
'
)
this
.
$element
.
off
(
this
.
options
.
ns
).
removeData
(
'
popover
'
)
}
})
...
...
@@ -97,6 +97,7 @@
placement
:
'
right
'
,
content
:
''
,
template
:
'
<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>
'
,
ns
:
'
.popover
'
})
}(
window
.
jQuery
);
\ No newline at end of file
js/bootstrap-tooltip.js
View file @
2ee9b271
...
...
@@ -47,8 +47,8 @@
if
(
this
.
options
.
trigger
!=
'
manual
'
)
{
eventIn
=
this
.
options
.
trigger
==
'
hover
'
?
'
mouseenter
'
:
'
focus
'
eventOut
=
this
.
options
.
trigger
==
'
hover
'
?
'
mouseleave
'
:
'
blur
'
this
.
$element
.
on
(
eventIn
,
this
.
options
.
selector
,
$
.
proxy
(
this
.
enter
,
this
))
this
.
$element
.
on
(
eventOut
,
this
.
options
.
selector
,
$
.
proxy
(
this
.
leave
,
this
))
this
.
$element
.
on
(
eventIn
+
this
.
options
.
ns
,
this
.
options
.
selector
,
$
.
proxy
(
this
.
enter
,
this
))
this
.
$element
.
on
(
eventOut
+
this
.
options
.
ns
,
this
.
options
.
selector
,
$
.
proxy
(
this
.
leave
,
this
))
}
this
.
options
.
selector
?
...
...
@@ -236,7 +236,7 @@
}
,
destroy
:
function
()
{
this
.
$element
.
off
().
removeData
(
'
tooltip
'
)
this
.
$element
.
off
(
this
.
options
.
ns
).
removeData
(
'
tooltip
'
)
}
}
...
...
@@ -266,6 +266,7 @@
,
title
:
''
,
delay
:
0
,
html
:
true
,
ns
:
'
.tooltip
'
}
}(
window
.
jQuery
);
js/tests/unit/bootstrap-popover.js
View file @
2ee9b271
...
...
@@ -92,12 +92,14 @@ $(function () {
})
test
(
"
should destroy popover
"
,
function
()
{
var
popover
=
$
(
'
<div/>
'
).
popover
()
var
popover
=
$
(
'
<div/>
'
).
popover
()
.
on
(
'
click.foo
'
,
function
(){})
ok
(
popover
.
data
(
'
popover
'
),
'
popover has data
'
)
ok
(
popover
.
data
(
'
events
'
).
mouseover
&&
popover
.
data
(
'
events
'
).
mouseout
,
'
popover has hover event
'
)
ok
(
popover
.
data
(
'
events
'
).
click
[
0
].
namespace
==
'
foo
'
,
'
popover has extra click.foo event
'
)
popover
.
popover
(
'
destroy
'
)
ok
(
!
popover
.
data
(
'
popover
'
),
'
popover does not have data
'
)
ok
(
!
popover
.
data
(
'
events
'
),
'
popover does not have any events
'
)
ok
(
popover
.
data
(
'
events
'
).
click
[
0
].
namespace
==
'
foo
'
,
'
popover still has click.foo
'
)
ok
(
!
popover
.
data
(
'
events
'
).
mouseover
&&
!
popover
.
data
(
'
events
'
).
mouseout
,
'
popover does not have any events
'
)
})
})
\ No newline at end of file
js/tests/unit/bootstrap-tooltip.js
View file @
2ee9b271
...
...
@@ -129,12 +129,14 @@ $(function () {
})
test
(
"
should destroy tooltip
"
,
function
()
{
var
tooltip
=
$
(
'
<div/>
'
).
tooltip
()
var
tooltip
=
$
(
'
<div/>
'
).
tooltip
()
.
on
(
'
click.foo
'
,
function
(){})
ok
(
tooltip
.
data
(
'
tooltip
'
),
'
tooltip has data
'
)
ok
(
tooltip
.
data
(
'
events
'
).
mouseover
&&
tooltip
.
data
(
'
events
'
).
mouseout
,
'
tooltip has hover event
'
)
ok
(
tooltip
.
data
(
'
events
'
).
click
[
0
].
namespace
==
'
foo
'
,
'
tooltip has extra click.foo event
'
)
tooltip
.
tooltip
(
'
destroy
'
)
ok
(
!
tooltip
.
data
(
'
tooltip
'
),
'
tooltip does not have data
'
)
ok
(
!
tooltip
.
data
(
'
events
'
),
'
tooltip does not have any events
'
)
ok
(
tooltip
.
data
(
'
events
'
).
click
[
0
].
namespace
==
'
foo
'
,
'
tooltip still has click.foo
'
)
ok
(
!
tooltip
.
data
(
'
events
'
).
mouseover
&&
!
tooltip
.
data
(
'
events
'
).
mouseout
,
'
tooltip does not have any events
'
)
})
})
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