rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-26 23:54:23 +01:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.0-wip' of git://github.com/muan/bootstrap into muan-3.0.0-wip

Browse Source 
Conflicts:
	docs/assets/js/bootstrap.min.js
This commit is contained in:
fat 2013-07-17 21:14:02 -07:00
commit 102df4ff33
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/js/bootstrap.js vendored
View File

@ -1169,6 +1169,7 @@
$tip
.detach()
.css({ top: 0, left: 0, display: 'block' })
.addClass(placement)
this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
@ -1205,7 +1206,6 @@
$tip
.offset(offset)
.addClass(placement)
.addClass('in')
var actualWidth = $tip[0].offsetWidth

2
docs/assets/js/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long

14
js/tests/unit/tooltip.js
View File

@ -291,4 +291,18 @@ $(function () {
container.remove()
}, 100)
})
test("should add position class before positioning so that position-specific styles are taken into account", 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>')
.appendTo(container)
.tooltip({placement: 'right'})
.tooltip('show')
, tooltip = container.find(".tooltip")
ok( Math.round(target.offset().top + target[0].offsetHeight/2 - tooltip[0].offsetHeight/2) === tooltip.offset().top )
target.tooltip('hide')
})
})

2
js/tooltip.js
View File

@ -147,6 +147,7 @@
$tip
.detach()
.css({ top: 0, left: 0, display: 'block' })
.addClass(placement)
this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
@ -183,7 +184,6 @@
$tip
.offset(offset)
.addClass(placement)
.addClass('in')
var actualWidth = $tip[0].offsetWidth