Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorGuillaume Gautreau <guillaume+github@ghusse.com>2013-01-27 13:56:01 +0400
committerGuillaume Gautreau <guillaume+github@ghusse.com>2013-01-27 13:56:01 +0400
commitee71fb492ffc664627436431c5f7b71d2107a526 (patch)
tree5e9a5233222c3b4a0934968249b9008dfc471a1b /js
parent5b0f956a60d8bd41084a167f83c25e276de11705 (diff)
No semicolumns
Diffstat (limited to 'js')
-rw-r--r--js/bootstrap-tooltip.js46
-rw-r--r--js/tests/unit/bootstrap-tooltip.js42
2 files changed, 44 insertions, 44 deletions
diff --git a/js/bootstrap-tooltip.js b/js/bootstrap-tooltip.js
index c3708744e5..718f9643ee 100644
--- a/js/bootstrap-tooltip.js
+++ b/js/bootstrap-tooltip.js
@@ -152,7 +152,7 @@
break
}
- this.applyPlacement(tp, placement);
+ this.applyPlacement(tp, placement)
this.$element.trigger('shown')
}
@@ -165,52 +165,52 @@
, actualWidth
, actualHeight
, delta
- , replace = false;
+ , replace = false
- $tip = this.tip();
+ $tip = this.tip()
- width = $tip[0].offsetWidth;
- height = $tip[0].offsetHeight;
+ width = $tip[0].offsetWidth
+ height = $tip[0].offsetHeight
$tip
.offset(offset)
.addClass(placement)
- .addClass('in');
+ .addClass('in')
- actualWidth = $tip[0].offsetWidth;
- actualHeight = $tip[0].offsetHeight;
+ actualWidth = $tip[0].offsetWidth
+ actualHeight = $tip[0].offsetHeight
if (placement == "top" && actualHeight != height){
- offset.top = offset.top + height - actualHeight;
- replace = true;
+ offset.top = offset.top + height - actualHeight
+ replace = true
}
if (placement == "bottom" || placement == "top"){
- delta = 0;
+ delta = 0
if (offset.left < 0){
- delta = -offset.left * 2;
- offset.left = 0;
- $tip.offset(offset);
- actualWidth = $tip[0].offsetWidth;
- actualHeight = $tip[0].offsetHeight;
+ delta = -offset.left * 2
+ offset.left = 0
+ $tip.offset(offset)
+ actualWidth = $tip[0].offsetWidth
+ actualHeight = $tip[0].offsetHeight
}
- this.replaceArrow(delta - width + actualWidth, actualWidth, "left");
+ this.replaceArrow(delta - width + actualWidth, actualWidth, "left")
}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){
- var $arrow = this.arrow();
+ var $arrow = this.arrow()
if (delta !== 0){
- $arrow.css(position, 50 * (1 - delta / dimension) + "%");
+ $arrow.css(position, 50 * (1 - delta / dimension) + "%")
}else{
- $arrow.css(position, "");
+ $arrow.css(position, "")
}
}
@@ -287,7 +287,7 @@
}
, arrow: function(){
- return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow");
+ return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow")
}
, validate: function () {
diff --git a/js/tests/unit/bootstrap-tooltip.js b/js/tests/unit/bootstrap-tooltip.js
index 666c417ee1..dc4c19bcfd 100644
--- a/js/tests/unit/bootstrap-tooltip.js
+++ b/js/tests/unit/bootstrap-tooltip.js
@@ -259,17 +259,17 @@ $(function () {
.css({position: "absolute", top:0, left: 0})
.appendTo(container)
.tooltip({placement: "top", animate: false})
- .tooltip("show");
+ .tooltip("show")
- stop();
+ stop()
setTimeout(function(){
- ok($(".tooltip").offset().left >= 0);
+ ok($(".tooltip").offset().left >= 0)
- start();
- container.remove();
+ start()
+ container.remove()
}, 100)
- });
+ })
test("should place tooltip on top of element", function(){
var container = $("<div />").appendTo("body")
@@ -279,18 +279,18 @@ $(function () {
.css({marginTop: 200})
.appendTo(p)
.tooltip({placement: "top", animate: false})
- .tooltip("show");
+ .tooltip("show")
- stop();
+ stop()
setTimeout(function(){
- var tooltip = container.find(".tooltip");
+ var tooltip = container.find(".tooltip")
- start();
- ok(tooltip.offset().top + tooltip.outerHeight() <= tooltiped.offset().top);
- container.remove();
+ start()
+ ok(tooltip.offset().top + tooltip.outerHeight() <= tooltiped.offset().top)
+ container.remove()
}, 100)
- });
+ })
test("arrow should point to element", function(){
var container = $("<div />").appendTo("body")
@@ -300,16 +300,16 @@ $(function () {
.css({marginTop: 200})
.appendTo(p)
.tooltip({placement: "top", animate: false})
- .tooltip("show");
+ .tooltip("show")
- stop();
+ stop()
setTimeout(function(){
- var arrow = container.find(".tooltip-arrow");
+ var arrow = container.find(".tooltip-arrow")
- start();
- ok(Math.abs(arrow.offset().left - tooltiped.offset().left - tooltiped.outerWidth()/2) <= 1);
- container.remove();
- }, 100);
- });
+ start()
+ ok(Math.abs(arrow.offset().left - tooltiped.offset().left - tooltiped.outerWidth()/2) <= 1)
+ container.remove()
+ }, 100)
+ })
})