deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

return null when no matched elements exist for offset and position

Browse source
This commit is contained in:
Brandon Aaron 2009-03-17 20:50:17 +00:00
parent 36b4a9ba33
commit a37cccc882
1 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
src/offset.js
View file

@ -1,7 +1,7 @@
if ( "getBoundingClientRect" in document.documentElement ) if ( "getBoundingClientRect" in document.documentElement )
jQuery.fn.offset = function() { jQuery.fn.offset = function() {
var elem = this[0]; var elem = this[0];
if ( !elem ) return { top: 0, left: 0 }; if ( !elem ) return null;
if ( elem === elem.ownerDocument.body ) return jQuery.offset.bodyOffset( elem ); if ( elem === elem.ownerDocument.body ) return jQuery.offset.bodyOffset( elem );
var box = elem.getBoundingClientRect(), doc = elem.ownerDocument, body = doc.body, docElem = doc.documentElement, 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, clientTop = docElem.clientTop || body.clientTop || 0, clientLeft = docElem.clientLeft || body.clientLeft || 0,
@ -12,7 +12,7 @@ if ( "getBoundingClientRect" in document.documentElement )
else else
jQuery.fn.offset = function() { jQuery.fn.offset = function() {
var elem = this[0]; var elem = this[0];
if ( !elem ) return { top: 0, left: 0 }; if ( !elem ) return null;
if ( elem === elem.ownerDocument.body ) return jQuery.offset.bodyOffset( elem ); if ( elem === elem.ownerDocument.body ) return jQuery.offset.bodyOffset( elem );
jQuery.offset.initialized || jQuery.offset.initialize(); jQuery.offset.initialized || jQuery.offset.initialize();
@ -88,32 +88,32 @@ jQuery.offset = {
jQuery.fn.extend({ jQuery.fn.extend({
position: function() { position: function() {
var left = 0, top = 0, results; if ( !this[0] ) return null;
if ( this[0] ) { var left = 0, top = 0, results,
// Get *real* offsetParent
var offsetParent = this.offsetParent(),
// Get correct offsets // Get *real* offsetParent
offset = this.offset(), offsetParent = this.offsetParent(),
parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset();
// Subtract element margins // Get correct offsets
// note: when an element has margin: auto the offsetLeft and marginLeft offset = this.offset(),
// are the same in Safari causing offset.left to incorrectly be 0 parentOffset = /^body|html$/i.test(offsetParent[0].tagName) ? { top: 0, left: 0 } : offsetParent.offset();
offset.top -= num( this, 'marginTop' );
offset.left -= num( this, 'marginLeft' );
// Add offsetParent borders // Subtract element margins
parentOffset.top += num( offsetParent, 'borderTopWidth' ); // note: when an element has margin: auto the offsetLeft and marginLeft
parentOffset.left += num( offsetParent, 'borderLeftWidth' ); // are the same in Safari causing offset.left to incorrectly be 0
offset.top -= num( this, 'marginTop' );
offset.left -= num( this, 'marginLeft' );
// Subtract the two offsets // Add offsetParent borders
results = { parentOffset.top += num( offsetParent, 'borderTopWidth' );
top: offset.top - parentOffset.top, parentOffset.left += num( offsetParent, 'borderLeftWidth' );
left: offset.left - parentOffset.left
}; // Subtract the two offsets
} results = {
top: offset.top - parentOffset.top,
left: offset.left - parentOffset.left
};
return results; return results;
}, },
@ -132,7 +132,7 @@ jQuery.each( ['Left', 'Top'], function(i, name) {
var method = 'scroll' + name; var method = 'scroll' + name;
jQuery.fn[ method ] = function(val) { jQuery.fn[ method ] = function(val) {
if (!this[0]) return null; if ( !this[0] ) return null;
return val !== undefined ? return val !== undefined ?