Offset: Eliminate little-used internal function

Fixes gh-3449 Closes gh-3456
jquery · Dec 19, 2016 · bf3a43eff8682b59cec785be6003753fa4b93706 · mgol · Feb 28, 2017 · mgol
1 parent 8cb4cd7
commit bf3a43eff8682b59cec785be6003753fa4b93706
Unified Split

Showing with 10 additions and 10 deletions.

+10 −10 src/offset.js
diff --git a/src/offset.js b/src/offset.js
@@ -15,13 +15,6 @@ define( [
 
 "use strict";
 
-/**
- * Gets a window from an element
- */
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ? elem : elem.nodeType === 9 && elem.defaultView;
-}
-
 jQuery.offset = {
 	setOffset: function( elem, options, i ) {
 		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
@@ -86,7 +79,7 @@ jQuery.fn.extend( {
 				} );
 		}
 
-		var docElem, win, rect, doc,
+		var doc, docElem, rect, win,
 			elem = this[ 0 ];
 
 		if ( !elem ) {
@@ -104,8 +97,8 @@ jQuery.fn.extend( {
 		rect = elem.getBoundingClientRect();
 
 		doc = elem.ownerDocument;
-		win = getWindow( doc );
 		docElem = doc.documentElement;
+		win = doc.defaultView;
 
 		return {
 			top: rect.top + win.pageYOffset - docElem.clientTop,
@@ -183,7 +176,14 @@ jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function(
 
 	jQuery.fn[ method ] = function( val ) {
 		return access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
+
+			// Coalesce documents and windows
+			var win;
+			if ( jQuery.isWindow( elem ) ) {
+				win = elem;
+			} else if ( elem.nodeType === 9 ) {
+				win = elem.defaultView;
+			}
 
 			if ( val === undefined ) {
 				return win ? win[ prop ] : elem[ method ];