mirror of
https://github.com/jquery/jquery.git
synced 2024-10-05 11:34:18 +00:00
Event: fix incorrect window bug with scrollTop/Left in iframes
Fixes gh-1945 Closes gh-1959
This commit is contained in:
parent
d6c97abb74
commit
d21edb599d
@ -171,8 +171,8 @@ jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function(
|
||||
|
||||
if ( win ) {
|
||||
win.scrollTo(
|
||||
!top ? val : window.pageXOffset,
|
||||
top ? val : window.pageYOffset
|
||||
!top ? val : win.pageXOffset,
|
||||
top ? val : win.pageYOffset
|
||||
);
|
||||
|
||||
} else {
|
||||
|
@ -531,4 +531,19 @@ test("fractions (see #7730 and #7885)", function() {
|
||||
div.remove();
|
||||
});
|
||||
|
||||
test("iframe scrollTop/Left (see gh-1945)", function() {
|
||||
expect( 2 );
|
||||
|
||||
// Tests scrollTop/Left with iframes
|
||||
var ifDoc = jQuery( "#iframe" )[ 0 ].contentDocument;
|
||||
jQuery( "#iframe" ).css( "width", "50px" ).css( "height", "50px" );
|
||||
ifDoc.write( "<div style='width: 1000px; height: 1000px;'></div>" );
|
||||
|
||||
jQuery( ifDoc ).scrollTop( 200 );
|
||||
jQuery( ifDoc ).scrollLeft( 500 );
|
||||
|
||||
equal( jQuery( ifDoc ).scrollTop(), 200, "$($('#iframe')[0].contentDocument).scrollTop()" );
|
||||
equal( jQuery( ifDoc ).scrollLeft(), 500, "$($('#iframe')[0].contentDocument).scrollLeft()" );
|
||||
});
|
||||
|
||||
})();
|
||||
|
Loading…
Reference in New Issue
Block a user