X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Foffset.js;h=0a8b9e64faa100b9441619f3353e2cf04aa47a7e;hb=991d039b62f5dfcb9e3d99fe28212a6874e8f5c7;hp=1ee1405850d2eb5ebdd1da1f3434889a4861fe0b;hpb=2937d645cbf32e720d71f2f07f01e30fce0f9a88;p=jquery.git
diff --git a/src/offset.js b/src/offset.js
index 1ee1405..0a8b9e6 100644
--- a/src/offset.js
+++ b/src/offset.js
@@ -1,18 +1,18 @@
if ( "getBoundingClientRect" in document.documentElement )
jQuery.fn.offset = function() {
var elem = this[0];
- if ( !elem ) return null;
+ if ( !elem || !elem.ownerDocument ) return null;
if ( elem === elem.ownerDocument.body ) return jQuery.offset.bodyOffset( elem );
var box = elem.getBoundingClientRect(), doc = elem.ownerDocument, body = doc.body, docElem = doc.documentElement,
clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
- top = box.top + (self.pageYOffset || jQuery.boxModel && docElem.scrollTop || body.scrollTop ) - clientTop,
- left = box.left + (self.pageXOffset || jQuery.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
+ top = box.top + (self.pageYOffset || jQuery.support.boxModel && docElem.scrollTop || body.scrollTop ) - clientTop,
+ left = box.left + (self.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft) - clientLeft;
return { top: top, left: left };
};
else
jQuery.fn.offset = function() {
var elem = this[0];
- if ( !elem ) return null;
+ if ( !elem || !elem.ownerDocument ) return null;
if ( elem === elem.ownerDocument.body ) return jQuery.offset.bodyOffset( elem );
jQuery.offset.initialize();
@@ -29,13 +29,13 @@ else
if ( elem === offsetParent ) {
top += elem.offsetTop, left += elem.offsetLeft;
if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && /^t(able|d|h)$/i.test(elem.tagName)) )
- top += parseFloat( computedStyle.borderTopWidth, 10) || 0,
- left += parseFloat( computedStyle.borderLeftWidth, 10) || 0;
+ top += parseFloat( computedStyle.borderTopWidth ) || 0,
+ left += parseFloat( computedStyle.borderLeftWidth ) || 0;
prevOffsetParent = offsetParent, offsetParent = elem.offsetParent;
}
if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" )
- top += parseFloat( computedStyle.borderTopWidth, 10) || 0,
- left += parseFloat( computedStyle.borderLeftWidth, 10) || 0;
+ top += parseFloat( computedStyle.borderTopWidth ) || 0,
+ left += parseFloat( computedStyle.borderLeftWidth ) || 0;
prevComputedStyle = computedStyle;
}
@@ -44,28 +44,28 @@ else
left += body.offsetLeft;
if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" )
- top += Math.max(docElem.scrollTop, body.scrollTop),
- left += Math.max(docElem.scrollLeft, body.scrollLeft);
+ top += Math.max( docElem.scrollTop, body.scrollTop ),
+ left += Math.max( docElem.scrollLeft, body.scrollLeft );
return { top: top, left: left };
};
jQuery.offset = {
initialize: function() {
- var body = document.body, container = document.createElement('div'), innerDiv, checkDiv, table, td, prop, bodyMarginTop = parseFloat(jQuery.curCSS(body, 'marginTop', true), 10) || 0,
+ var body = document.body, container = document.createElement('div'), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.curCSS(body, 'marginTop', true) ) || 0,
html = '';
jQuery.extend( container.style, { position: 'absolute', top: 0, left: 0, margin: 0, border: 0, width: '1px', height: '1px', visibility: 'hidden' } );
container.innerHTML = html;
- body.insertBefore(container, body.firstChild);
+ body.insertBefore( container, body.firstChild );
innerDiv = container.firstChild, checkDiv = innerDiv.firstChild, td = innerDiv.nextSibling.firstChild.firstChild;
this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
checkDiv.style.position = 'fixed', checkDiv.style.top = '20px';
- this.supportsFixedPosition = (checkDiv.offsetTop >= 15); // safari subtracts parent border width here which is 5px
+ this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15); // safari subtracts parent border width here which is 5px
checkDiv.style.position = '', checkDiv.style.top = '';
innerDiv.style.overflow = 'hidden', innerDiv.style.position = 'relative';
@@ -73,16 +73,18 @@ jQuery.offset = {
this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
- body.removeChild(container);
+ body.removeChild( container );
jQuery.offset.initialize = function(){};
+
+ body = container = innerDiv = checkDiv = table = td = null;
},
bodyOffset: function(body) {
jQuery.offset.initialize();
var top = body.offsetTop, left = body.offsetLeft;
if ( jQuery.offset.doesNotIncludeMarginInBodyOffset )
- top += parseFloat( jQuery.curCSS(body, 'marginTop', true), 10 ) || 0,
- left += parseFloat( jQuery.curCSS(body, 'marginLeft', true), 10 ) || 0;
+ top += parseFloat( jQuery.curCSS(body, 'marginTop', true) ) || 0,
+ left += parseFloat( jQuery.curCSS(body, 'marginLeft', true) ) || 0;
return { top: top, left: left };
}
};
@@ -92,7 +94,7 @@ jQuery.fn.extend({
position: function() {
if ( !this[0] ) return null;
- var elem = this[0], left = 0, top = 0, results,
+ var elem = this[0],
// Get *real* offsetParent
offsetParent = this.offsetParent(),
@@ -104,27 +106,25 @@ jQuery.fn.extend({
// Subtract element margins
// note: when an element has margin: auto the offsetLeft and marginLeft
// are the same in Safari causing offset.left to incorrectly be 0
- offset.top -= parseFloat( jQuery.curCSS(elem, 'marginTop', true), 10 ) || 0;
- offset.left -= parseFloat( jQuery.curCSS(elem, 'marginLeft', true), 10 ) || 0;
+ offset.top -= parseFloat( jQuery.curCSS(elem, 'marginTop', true) ) || 0;
+ offset.left -= parseFloat( jQuery.curCSS(elem, 'marginLeft', true) ) || 0;
// Add offsetParent borders
- parentOffset.top += parseFloat( jQuery.curCSS(offsetParent[0], 'borderTopWidth', true), 10 ) || 0;
- parentOffset.left += parseFloat( jQuery.curCSS(offsetParent[0], 'borderLeftWidth', true), 10 ) || 0;
+ parentOffset.top += parseFloat( jQuery.curCSS(offsetParent[0], 'borderTopWidth', true) ) || 0;
+ parentOffset.left += parseFloat( jQuery.curCSS(offsetParent[0], 'borderLeftWidth', true) ) || 0;
// Subtract the two offsets
- results = {
+ return {
top: offset.top - parentOffset.top,
left: offset.left - parentOffset.left
};
-
- return results;
},
offsetParent: function() {
var offsetParent = this[0].offsetParent || document.body;
- while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') == 'static') )
+ while ( offsetParent && (!/^body|html$/i.test(offsetParent.tagName) && jQuery.css(offsetParent, 'position') === 'static') )
offsetParent = offsetParent.offsetParent;
- return jQuery(offsetParent);
+ return jQuery( offsetParent );
}
});
@@ -135,24 +135,32 @@ jQuery.each( ['Left', 'Top'], function(i, name) {
jQuery.fn[ method ] = function(val) {
if ( !this[0] ) return null;
+
+ var elem = this[0], win = ("scrollTo" in elem && elem.document) ? elem :
+ (elem.nodeName === "#document") ? elem.defaultView || elem.parentWindow :
+ false;
return val !== undefined ?
// Set the scroll offset
this.each(function() {
- this == window || this == document ?
- window.scrollTo(
- !i ? val : jQuery(window).scrollLeft(),
- i ? val : jQuery(window).scrollTop()
+ win = ("scrollTo" in this && this.document) ? this :
+ (this.nodeName === "#document") ? this.defaultView || this.parentWindow :
+ false;
+
+ win ?
+ win.scrollTo(
+ !i ? val : jQuery(win).scrollLeft(),
+ i ? val : jQuery(win).scrollTop()
) :
this[ method ] = val;
}) :
// Return the scroll offset
- this[0] == window || this[0] == document ?
- self[ i ? 'pageYOffset' : 'pageXOffset' ] ||
- jQuery.boxModel && document.documentElement[ method ] ||
- document.body[ method ] :
- this[0][ method ];
+ win ?
+ win[ i ? 'pageYOffset' : 'pageXOffset' ] ||
+ jQuery.support.boxModel && win.document.documentElement[ method ] ||
+ win.document.body[ method ] :
+ elem[ method ];
};
});