2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00
This commit is contained in:
fat
2013-07-17 23:25:26 -07:00
parent 451acb42db
commit 8cf04911db
5 changed files with 41 additions and 16 deletions
+6 -4
View File
@@ -64,11 +64,13 @@
}
Popover.prototype.getContent = function () {
var content = typeof this.options.content == 'function' ?
this.options.content.call(this.$element[0]) :
this.options.content
var $e = this.$element
var o = this.options
return content || this.$element.attr('data-content')
return $e.attr('data-content')
|| (typeof o.content == 'function' ?
o.content.call($e[0]) :
o.content)
}
Popover.prototype.tip = function () {
+20
View File
@@ -77,6 +77,26 @@ $(function () {
$('#qunit-fixture').empty()
})
test("should get title and content from attributes #2", function () {
$.support.transition = false
var popover = $('<a href="#" title="@mdo" data-content="loves data attributes (づ。◕‿‿◕。)づ ︵ ┻━┻" >@mdo</a>')
.appendTo('#qunit-fixture')
.popover({
title: 'ignored title option',
content: 'ignored content option'
})
.popover('show')
ok($('.popover').length, 'popover was inserted')
equals($('.popover .popover-title').text(), '@mdo', 'title correctly inserted')
equals($('.popover .popover-content').text(), "loves data attributes (づ。◕‿‿◕。)づ ︵ ┻━┻", 'content correctly inserted')
popover.popover('hide')
ok(!$('.popover').length, 'popover was removed')
$('#qunit-fixture').empty()
})
test("should respect custom classes", function() {
$.support.transition = false
var popover = $('<a href="#">@fat</a>')
+1 -1
View File
@@ -296,7 +296,7 @@ $(function () {
$("head").append('<style> .tooltip.right { white-space: nowrap; } .tooltip.right .tooltip-inner { max-width: none; } </style>')
var container = $("<div />").appendTo("body")
, target = $('<a href="#" rel="tooltip" title="very very very very very very very very long tooltip in one line">To my right</a>')
, target = $('<a href="#" rel="tooltip" title="very very very very very very very very long tooltip in one line"></a>')
.appendTo(container)
.tooltip({placement: 'right'})
.tooltip('show')