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

fix scrollspy test in firefox mac os

Browse Source
This commit is contained in:
fat
2014-07-06 21:50:46 -07:00
parent b5d86ad0bd
commit 587c09cb48
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
js/tests/unit/scrollspy.js
View File

@@ -124,17 +124,17 @@ $(function () {
test('should add the active class to the correct element', function () { test('should add the active class to the correct element', function () {
var navbarHtml = var navbarHtml =
'<div class="navbar">' + '<div class="navbar">'
'<ul class="nav">' + + '<ul class="nav">'
'<li id="li-1"><a href="#div-1">div 1</a></li>' + + '<li id="li-1"><a href="#div-1">div 1</a></li>'
'<li id="li-2"><a href="#div-2">div 2</a></li>' + + '<li id="li-2"><a href="#div-2">div 2</a></li>'
'</ul>' + + '</ul>'
'</div>' + '</div>'
var contentHtml = var contentHtml =
'<div class="content" style="overflow: auto; height: 50px">' + '<div class="content" style="overflow: auto; height: 50px">'
'<div id="div-1" style="height: 100px; padding: 0; margin: 0">div 1</div>' + + '<div id="div-1" style="height: 100px; padding: 0; margin: 0">div 1</div>'
'<div id="div-2" style="height: 200px; padding: 0; margin: 0">div 2</div>' + + '<div id="div-2" style="height: 200px; padding: 0; margin: 0">div 2</div>'
'</div>' + '</div>'
$(navbarHtml).appendTo('#qunit-fixture') $(navbarHtml).appendTo('#qunit-fixture')
var $content = $(contentHtml) var $content = $(contentHtml)
@@ -143,7 +143,7 @@ $(function () {
var testElementIsActiveAfterScroll = function (element, target) { var testElementIsActiveAfterScroll = function (element, target) {
var deferred = $.Deferred() var deferred = $.Deferred()
var scrollHeight = $content.scrollTop() + $(target).position().top var scrollHeight = Math.ceil($content.scrollTop() + $(target).position().top)
stop() stop()
$content.one('scroll', function () { $content.one('scroll', function () {
ok($(element).hasClass('active'), 'target:' + target + ', element' + element) ok($(element).hasClass('active'), 'target:' + target + ', element' + element)