jQuery.support.supportsFixedPosition -> jQuery.support.fixedPosition; Remove jQuery...

diff --git a/src/offset.js b/src/offset.js
index 054869da6fbf8a2f81d54f6e556e75deae1e7664..ad10236f66b69857e6cd20d71a973489b495b64e 100644 (file)
--- a/src/offset.js
+++ b/src/offset.js
@@ -75,7 +75,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
                        left = elem.offsetLeft;
 
                while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
-                       if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+                       if ( jQuery.support.fixedPosition && prevComputedStyle.position === "fixed" ) {
                                break;
                        }
 
@@ -87,7 +87,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
                                top  += elem.offsetTop;
                                left += elem.offsetLeft;
 
-                               if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
+                               if ( jQuery.support.doesNotAddBorder && !(jQuery.support.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
                                        top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
                                        left += parseFloat( computedStyle.borderLeftWidth ) || 0;
                                }
@@ -96,7 +96,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
                                offsetParent = elem.offsetParent;
                        }
 
-                       if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
+                       if ( jQuery.support.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
                                top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
                                left += parseFloat( computedStyle.borderLeftWidth ) || 0;
                        }
@@ -109,7 +109,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
                        left += body.offsetLeft;
                }
 
-               if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+               if ( jQuery.support.fixedPosition && prevComputedStyle.position === "fixed" ) {
                        top  += Math.max( docElem.scrollTop, body.scrollTop );
                        left += Math.max( docElem.scrollLeft, body.scrollLeft );
                }
@@ -118,23 +118,13 @@ if ( "getBoundingClientRect" in document.documentElement ) {
        };
 }
 
-jQuery.offset = {};
-
-jQuery.each(
-       ( "doesAddBorderForTableAndCells doesNotAddBorder " +
-               "doesNotIncludeMarginInBodyOffset subtractsBorderForOverflowNotVisible " +
-               "supportsFixedPosition" ).split(" "), function( i, prop ) {
-
-       jQuery.offset[ prop ] = jQuery.support[ prop ];
-});
-
-jQuery.extend( jQuery.offset, {
+jQuery.offset = {
 
        bodyOffset: function( body ) {
                var top = body.offsetTop,
                        left = body.offsetLeft;
 
-               if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
+               if ( jQuery.support.doesNotIncludeMarginInBodyOffset ) {
                        top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
                        left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
                }
@@ -184,7 +174,7 @@ jQuery.extend( jQuery.offset, {
                        curElem.css( props );
                }
        }
-});
+};
 
 
 jQuery.fn.extend({

diff --git a/src/support.js b/src/support.js
index 38cceff4b0d8ce30a8030e5f44345ad0f3d654af..1920e5b87eb8f806dbce03dae66cf0cdc8e31bbf 100644 (file)
--- a/src/support.js
+++ b/src/support.js
@@ -289,7 +289,7 @@ jQuery.support = (function() {
                inner.style.top = "20px";
 
                // safari subtracts parent border width here which is 5px
-               offsetSupport.supportsFixedPosition = ( inner.offsetTop === 20 || inner.offsetTop === 15 );
+               offsetSupport.fixedPosition = ( inner.offsetTop === 20 || inner.offsetTop === 15 );
                inner.style.position = inner.style.top = "";
 
                outer.style.overflow = "hidden";
@@ -301,8 +301,6 @@ jQuery.support = (function() {
                body.removeChild( container );
                testElement = container = null;
 
-               // Extend both jQuery.offset and jQuery.support
-               jQuery.extend( jQuery.offset, offsetSupport );
                jQuery.extend( support, offsetSupport );
        });