diff options
| author | Mark Otto <[email protected]> | 2013-12-08 02:00:37 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-08 02:00:37 -0800 |
| commit | c37b710e85e379ddffb305af8a765013c0cd0333 (patch) | |
| tree | 8c23e05b150a14a39c2be90b39d03343b8c994f7 /js/tests | |
| parent | b5008ebf9ca1c9c90a6ec73ae12e55a8f155017f (diff) | |
| parent | e43e87b2f30a9f4967818f1ce8d25a4f88a1f490 (diff) | |
| download | bootstrap-c37b710e85e379ddffb305af8a765013c0cd0333.tar.xz bootstrap-c37b710e85e379ddffb305af8a765013c0cd0333.zip | |
Merge branch 'master' into pr/11744
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'js/tests')
| -rw-r--r-- | js/tests/unit/scrollspy.js | 2 | ||||
| -rw-r--r-- | js/tests/unit/tooltip.js | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/js/tests/unit/scrollspy.js b/js/tests/unit/scrollspy.js index 06219a1c8..1b546a579 100644 --- a/js/tests/unit/scrollspy.js +++ b/js/tests/unit/scrollspy.js @@ -19,7 +19,7 @@ $(function () { test("should switch active class on scroll", function () { var sectionHTML = '<div id="masthead"></div>' , $section = $(sectionHTML).append('#qunit-fixture') - , topbarHTML ='<div class="topbar">' + , topbarHTML = '<div class="topbar">' + '<div class="topbar-inner">' + '<div class="container">' + '<h3><a href="#">Bootstrap</a></h3>' diff --git a/js/tests/unit/tooltip.js b/js/tests/unit/tooltip.js index 2139dc811..cc559ccb6 100644 --- a/js/tests/unit/tooltip.js +++ b/js/tests/unit/tooltip.js @@ -290,7 +290,7 @@ $(function () { test("should place tooltips inside the body", function () { var tooltip = $('<a href="#" rel="tooltip" title="Another tooltip"></a>') .appendTo('#qunit-fixture') - .tooltip({container:'body'}) + .tooltip({container: 'body'}) .tooltip('show') ok($("body > .tooltip").length, 'inside the body') ok(!$("#qunit-fixture > .tooltip").length, 'not found in parent') @@ -301,7 +301,7 @@ $(function () { var container = $("<div />").appendTo("body") .css({position: "absolute", width: 200, height: 200, bottom: 0, left: 0}) , tooltip = $("<a href='#' title='Very very very very very very very very long tooltip'>Hover me</a>") - .css({position: "absolute", top:0, left: 0}) + .css({position: "absolute", top: 0, left: 0}) .appendTo(container) .tooltip({placement: "top", animate: false}) .tooltip("show") @@ -347,7 +347,7 @@ $(function () { .tooltip('show') , tooltip = container.find(".tooltip") - ok( Math.round(target.offset().top + target[0].offsetHeight/2 - tooltip[0].offsetHeight/2) === Math.round(tooltip.offset().top) ) + ok( Math.round(target.offset().top + (target[0].offsetHeight / 2) - (tooltip[0].offsetHeight / 2)) === Math.round(tooltip.offset().top) ) target.tooltip('hide') }) |