From a2386a8250c82e27680d21f7f6fd1eb9a8f7e938 Mon Sep 17 00:00:00 2001
From: Timmy Willison <timmywillisn@gmail.com>
Date: Tue, 5 May 2015 08:31:39 -0700
Subject: [PATCH] Offset: remove ownerDocument check in offset getter

Fixes gh-2115
---
 src/offset.js       |  9 +++++----
 test/unit/offset.js | 11 +----------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/offset.js b/src/offset.js
index 0cc26d7d9..e4a706ee0 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -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;
 
diff --git a/test/unit/offset.js b/test/unit/offset.js
index c0eacb65c..3977e3933 100644
--- a/test/unit/offset.js
+++ b/test/unit/offset.js
@@ -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);