Commit a2386a82 authored by Timmy Willison's avatar Timmy Willison

Offset: remove ownerDocument check in offset getter

Fixes gh-2115
parent d4dd548a
......@@ -79,6 +79,7 @@ jQuery.offset = {
jQuery.fn.extend({
offset: function( options ) {
// Preserve chaining for setter
if ( arguments.length ) {
return options === undefined ?
this :
......@@ -87,11 +88,10 @@ jQuery.fn.extend({
});
}
var docElem, win, rect,
elem = this[ 0 ],
doc = elem && elem.ownerDocument;
var docElem, win, rect, doc,
elem = this[ 0 ];
if ( !doc ) {
if ( !elem ) {
return;
}
......@@ -99,6 +99,7 @@ jQuery.fn.extend({
// Make sure element is not hidden (display: none) or disconnected
if ( rect.width || rect.height || elem.getClientRects().length ) {
doc = elem.ownerDocument;
win = getWindow( doc );
docElem = doc.documentElement;
......
......@@ -43,20 +43,11 @@ module("offset", { setup: function(){
*/
test("empty set", function() {
expect(2);
expect( 2 );
strictEqual( jQuery().offset(), undefined, "offset() returns undefined for empty set (#11962)" );
strictEqual( jQuery().position(), undefined, "position() returns undefined for empty set (#11962)" );
});
test("object without getBoundingClientRect", function() {
expect(2);
// Simulates a browser without gBCR on elements, we just want to return 0,0
var result = jQuery({ ownerDocument: document }).offset();
equal( result.top, 0, "Check top" );
equal( result.left, 0, "Check left" );
});
test("disconnected element", function() {
expect(1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment