Permalink
Browse files

Event: fix incorrect window bug with scrollTop/Left in iframes

Fixes gh-1945
Closes gh-1959
  • Loading branch information...
araghava authored and markelog committed Dec 21, 2014
1 parent d6c97ab commit d21edb599d8f5f80a3f3ecba5b62311b9cd1a3e6
Showing with 17 additions and 2 deletions.
  1. +2 −2 src/offset.js
  2. +15 −0 test/unit/offset.js
View
@@ -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 {
View
@@ -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()" );
});
})();

0 comments on commit d21edb5

Please sign in to comment.