Skip to content
Permalink
Browse files

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

… Remove jQuery.offset.supportProps and reference support in offset
  • Loading branch information...
timmywil committed Oct 31, 2011
1 parent cec4018 commit 83a355a9a06c03eeb4e601dbe204909d273c91b5
Showing with 8 additions and 20 deletions.
  1. +7 −17 src/offset.js
  2. +1 −3 src/support.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({
@@ -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 );
});

0 comments on commit 83a355a

Please sign in to comment.
You can’t perform that action at this time.