mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-21 18:54:30 +01:00
Merge pull request #13165 from stefanneculai/master
Fix popover when using append
This commit is contained in:
commit
b3421cf040
@ -44,7 +44,7 @@
|
|||||||
var content = this.getContent()
|
var content = this.getContent()
|
||||||
|
|
||||||
$tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
|
$tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
|
||||||
$tip.find('.popover-content')[ // we use append for html objects to maintain js events
|
$tip.find('.popover-content').empty()[ // we use append for html objects to maintain js events
|
||||||
this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
|
this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
|
||||||
](content)
|
](content)
|
||||||
|
|
||||||
|
@ -61,6 +61,35 @@ $(function () {
|
|||||||
$('#qunit-fixture').empty()
|
$('#qunit-fixture').empty()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
test('should not duplicate HTML object', function () {
|
||||||
|
$.support.transition = false
|
||||||
|
|
||||||
|
$div = $('<div>').html('loves writing tests (╯°□°)╯︵ ┻━┻')
|
||||||
|
|
||||||
|
var popover = $('<a href="#">@fat</a>')
|
||||||
|
.appendTo('#qunit-fixture')
|
||||||
|
.popover({
|
||||||
|
content: function () {
|
||||||
|
return $div
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
popover.popover('show')
|
||||||
|
ok($('.popover').length, 'popover was inserted')
|
||||||
|
equal($('.popover .popover-content').html(), $div, 'content correctly inserted')
|
||||||
|
|
||||||
|
popover.popover('hide')
|
||||||
|
ok(!$('.popover').length, 'popover was removed')
|
||||||
|
|
||||||
|
popover.popover('show')
|
||||||
|
ok($('.popover').length, 'popover was inserted')
|
||||||
|
equal($('.popover .popover-content').html(), $div, 'content correctly inserted')
|
||||||
|
|
||||||
|
popover.popover('hide')
|
||||||
|
ok(!$('.popover').length, 'popover was removed')
|
||||||
|
$('#qunit-fixture').empty()
|
||||||
|
})
|
||||||
|
|
||||||
test('should get title and content from attributes', function () {
|
test('should get title and content from attributes', function () {
|
||||||
$.support.transition = false
|
$.support.transition = false
|
||||||
var popover = $('<a href="#" title="@mdo" data-content="loves data attributes (づ。◕‿‿◕。)づ ︵ ┻━┻" >@mdo</a>')
|
var popover = $('<a href="#" title="@mdo" data-content="loves data attributes (づ。◕‿‿◕。)づ ︵ ┻━┻" >@mdo</a>')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user