mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-16 02:24:19 +02:00
Code Issues Releases Wiki Activity

No semicolumns

Browse Source
This commit is contained in:
Guillaume Gautreau
2013-01-27 10:56:01 +01:00
parent 5b0f956a60
commit ee71fb492f
2 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
js/bootstrap-tooltip.js vendored
View File

@@ -152,7 +152,7 @@
break break
} }
this.applyPlacement(tp, placement); this.applyPlacement(tp, placement)
this.$element.trigger('shown') this.$element.trigger('shown')
} }
@@ -165,52 +165,52 @@
, actualWidth , actualWidth
, actualHeight , actualHeight
, delta , delta
, replace = false; , replace = false
$tip = this.tip(); $tip = this.tip()
width = $tip[0].offsetWidth; width = $tip[0].offsetWidth
height = $tip[0].offsetHeight; height = $tip[0].offsetHeight
$tip $tip
.offset(offset) .offset(offset)
.addClass(placement) .addClass(placement)
.addClass('in'); .addClass('in')
actualWidth = $tip[0].offsetWidth; actualWidth = $tip[0].offsetWidth
actualHeight = $tip[0].offsetHeight; actualHeight = $tip[0].offsetHeight
if (placement == "top" && actualHeight != height){ if (placement == "top" && actualHeight != height){
offset.top = offset.top + height - actualHeight; offset.top = offset.top + height - actualHeight
replace = true; replace = true
} }
if (placement == "bottom" || placement == "top"){ if (placement == "bottom" || placement == "top"){
delta = 0; delta = 0
if (offset.left < 0){ if (offset.left < 0){
delta = -offset.left * 2; delta = -offset.left * 2
offset.left = 0; offset.left = 0
$tip.offset(offset); $tip.offset(offset)
actualWidth = $tip[0].offsetWidth; actualWidth = $tip[0].offsetWidth
actualHeight = $tip[0].offsetHeight; actualHeight = $tip[0].offsetHeight
} }
this.replaceArrow(delta - width + actualWidth, actualWidth, "left"); this.replaceArrow(delta - width + actualWidth, actualWidth, "left")
}else{ }else{
this.replaceArrow(actualHeight - height, actualHeight, "top"); this.replaceArrow(actualHeight - height, actualHeight, "top")
} }
if (replace) $tip.offset(offset); if (replace) $tip.offset(offset)
} }
, replaceArrow: function(delta, dimension, position){ , replaceArrow: function(delta, dimension, position){
var $arrow = this.arrow(); var $arrow = this.arrow()
if (delta !== 0){ if (delta !== 0){
$arrow.css(position, 50 * (1 - delta / dimension) + "%"); $arrow.css(position, 50 * (1 - delta / dimension) + "%")
}else{ }else{
$arrow.css(position, ""); $arrow.css(position, "")
} }
} }
@@ -287,7 +287,7 @@
} }
, arrow: function(){ , arrow: function(){
return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow"); return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow")
} }
, validate: function () { , validate: function () {

42
js/tests/unit/bootstrap-tooltip.js vendored
View File

@@ -259,17 +259,17 @@ $(function () {
.css({position: "absolute", top:0, left: 0}) .css({position: "absolute", top:0, left: 0})
.appendTo(container) .appendTo(container)
.tooltip({placement: "top", animate: false}) .tooltip({placement: "top", animate: false})
.tooltip("show"); .tooltip("show")
stop(); stop()
setTimeout(function(){ setTimeout(function(){
ok($(".tooltip").offset().left >= 0); ok($(".tooltip").offset().left >= 0)
start(); start()
container.remove(); container.remove()
}, 100) }, 100)
}); })
test("should place tooltip on top of element", function(){ test("should place tooltip on top of element", function(){
var container = $("<div />").appendTo("body") var container = $("<div />").appendTo("body")
@@ -279,18 +279,18 @@ $(function () {
.css({marginTop: 200}) .css({marginTop: 200})
.appendTo(p) .appendTo(p)
.tooltip({placement: "top", animate: false}) .tooltip({placement: "top", animate: false})
.tooltip("show"); .tooltip("show")
stop(); stop()
setTimeout(function(){ setTimeout(function(){
var tooltip = container.find(".tooltip"); var tooltip = container.find(".tooltip")
start(); start()
ok(tooltip.offset().top + tooltip.outerHeight() <= tooltiped.offset().top); ok(tooltip.offset().top + tooltip.outerHeight() <= tooltiped.offset().top)
container.remove(); container.remove()
}, 100) }, 100)
}); })
test("arrow should point to element", function(){ test("arrow should point to element", function(){
var container = $("<div />").appendTo("body") var container = $("<div />").appendTo("body")
@@ -300,16 +300,16 @@ $(function () {
.css({marginTop: 200}) .css({marginTop: 200})
.appendTo(p) .appendTo(p)
.tooltip({placement: "top", animate: false}) .tooltip({placement: "top", animate: false})
.tooltip("show"); .tooltip("show")
stop(); stop()
setTimeout(function(){ setTimeout(function(){
var arrow = container.find(".tooltip-arrow"); var arrow = container.find(".tooltip-arrow")
start(); start()
ok(Math.abs(arrow.offset().left - tooltiped.offset().left - tooltiped.outerWidth()/2) <= 1); ok(Math.abs(arrow.offset().left - tooltiped.offset().left - tooltiped.outerWidth()/2) <= 1)
container.remove(); container.remove()
}, 100); }, 100)
}); })
}) })