Skip to content
GitLab
Explore
Projects
Groups
Snippets
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
3c190908
Commit
3c190908
authored
10 years ago
by
Chris Rebert
Browse files
Options
Download
Plain Diff
Merge pull request #15988 from twbs/fix-15874
Hiding an uninitialized tooltip/popover no longer initializes it
parents
2f17289a
27bbc7db
4 merge requests
!28721
Hot test
,
!16605
Test pull please ignore
,
!22103
test
,
!25326
Adjust examples
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
js/popover.js
+1
-1
js/popover.js
js/tests/unit/popover.js
+12
-0
js/tests/unit/popover.js
js/tests/unit/tooltip.js
+12
-0
js/tests/unit/tooltip.js
js/tooltip.js
+1
-1
js/tooltip.js
with
26 additions
and
2 deletions
+26
-2
js/popover.js
+
1
-
1
View file @
3c190908
...
@@ -85,7 +85,7 @@
...
@@ -85,7 +85,7 @@
var
data
=
$this
.
data
(
'
bs.popover
'
)
var
data
=
$this
.
data
(
'
bs.popover
'
)
var
options
=
typeof
option
==
'
object
'
&&
option
var
options
=
typeof
option
==
'
object
'
&&
option
if
(
!
data
&&
option
==
'
destroy
'
)
return
if
(
!
data
&&
/destroy|hide/
.
test
(
option
)
)
return
if
(
!
data
)
$this
.
data
(
'
bs.popover
'
,
(
data
=
new
Popover
(
this
,
options
)))
if
(
!
data
)
$this
.
data
(
'
bs.popover
'
,
(
data
=
new
Popover
(
this
,
options
)))
if
(
typeof
option
==
'
string
'
)
data
[
option
]()
if
(
typeof
option
==
'
string
'
)
data
[
option
]()
})
})
...
...
This diff is collapsed.
Click to expand it.
js/tests/unit/popover.js
+
12
-
0
View file @
3c190908
...
@@ -247,4 +247,16 @@ $(function () {
...
@@ -247,4 +247,16 @@ $(function () {
},
new
Error
(
'
`selector` option must be specified when initializing popover on the window.document object!
'
))
},
new
Error
(
'
`selector` option must be specified when initializing popover on the window.document object!
'
))
})
})
QUnit
.
test
(
'
should do nothing when an attempt is made to hide an uninitialized popover
'
,
function
(
assert
)
{
assert
.
expect
(
1
)
var
$popover
=
$
(
'
<span data-toggle="popover" data-title="some title" data-content="some content">some text</span>
'
)
.
appendTo
(
'
#qunit-fixture
'
)
.
on
(
'
hidden.bs.popover shown.bs.popover
'
,
function
()
{
assert
.
ok
(
false
,
'
should not fire any popover events
'
)
})
.
bootstrapPopover
(
'
hide
'
)
assert
.
strictEqual
(
$popover
.
data
(
'
bs.popover
'
),
undefined
,
'
should not initialize the popover
'
)
})
})
})
This diff is collapsed.
Click to expand it.
js/tests/unit/tooltip.js
+
12
-
0
View file @
3c190908
...
@@ -1168,4 +1168,16 @@ $(function () {
...
@@ -1168,4 +1168,16 @@ $(function () {
},
new
Error
(
'
`selector` option must be specified when initializing tooltip on the window.document object!
'
))
},
new
Error
(
'
`selector` option must be specified when initializing tooltip on the window.document object!
'
))
})
})
QUnit
.
test
(
'
should do nothing when an attempt is made to hide an uninitialized tooltip
'
,
function
(
assert
)
{
assert
.
expect
(
1
)
var
$tooltip
=
$
(
'
<span data-toggle="tooltip" title="some tip">some text</span>
'
)
.
appendTo
(
'
#qunit-fixture
'
)
.
on
(
'
hidden.bs.tooltip shown.bs.tooltip
'
,
function
()
{
assert
.
ok
(
false
,
'
should not fire any tooltip events
'
)
})
.
bootstrapTooltip
(
'
hide
'
)
assert
.
strictEqual
(
$tooltip
.
data
(
'
bs.tooltip
'
),
undefined
,
'
should not initialize the tooltip
'
)
})
})
})
This diff is collapsed.
Click to expand it.
js/tooltip.js
+
1
-
1
View file @
3c190908
...
@@ -453,7 +453,7 @@
...
@@ -453,7 +453,7 @@
var
data
=
$this
.
data
(
'
bs.tooltip
'
)
var
data
=
$this
.
data
(
'
bs.tooltip
'
)
var
options
=
typeof
option
==
'
object
'
&&
option
var
options
=
typeof
option
==
'
object
'
&&
option
if
(
!
data
&&
option
==
'
destroy
'
)
return
if
(
!
data
&&
/destroy|hide/
.
test
(
option
)
)
return
if
(
!
data
)
$this
.
data
(
'
bs.tooltip
'
,
(
data
=
new
Tooltip
(
this
,
options
)))
if
(
!
data
)
$this
.
data
(
'
bs.tooltip
'
,
(
data
=
new
Tooltip
(
this
,
options
)))
if
(
typeof
option
==
'
string
'
)
data
[
option
]()
if
(
typeof
option
==
'
string
'
)
data
[
option
]()
})
})
...
...
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
Menu
Explore
Projects
Groups
Snippets