Commit daffb954 authored by Brandon Aaron's avatar Brandon Aaron

offset is now a setter

parent f55fb36e
if ( "getBoundingClientRect" in document.documentElement ) { if ( "getBoundingClientRect" in document.documentElement ) {
jQuery.fn.offset = function() { jQuery.fn.offset = function( options ) {
var elem = this[0]; var elem = this[0];
if ( !elem || !elem.ownerDocument ) { return null; } if ( !elem || !elem.ownerDocument ) { return null; }
if ( options ) {
return this.each(function() {
jQuery.offset.setOffset( this, options );
});
}
if ( elem === elem.ownerDocument.body ) { if ( elem === elem.ownerDocument.body ) {
return jQuery.offset.bodyOffset( elem ); return jQuery.offset.bodyOffset( elem );
} }
...@@ -13,9 +18,14 @@ if ( "getBoundingClientRect" in document.documentElement ) { ...@@ -13,9 +18,14 @@ if ( "getBoundingClientRect" in document.documentElement ) {
return { top: top, left: left }; return { top: top, left: left };
}; };
} else { } else {
jQuery.fn.offset = function() { jQuery.fn.offset = function( options ) {
var elem = this[0]; var elem = this[0];
if ( !elem || !elem.ownerDocument ) { return null; } if ( !elem || !elem.ownerDocument ) { return null; }
if ( options ) {
return this.each(function() {
jQuery.offset.setOffset( this, options );
});
}
if ( elem === elem.ownerDocument.body ) { if ( elem === elem.ownerDocument.body ) {
return jQuery.offset.bodyOffset( elem ); return jQuery.offset.bodyOffset( elem );
} }
...@@ -25,7 +35,7 @@ if ( "getBoundingClientRect" in document.documentElement ) { ...@@ -25,7 +35,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
var offsetParent = elem.offsetParent, prevOffsetParent = elem, var offsetParent = elem.offsetParent, prevOffsetParent = elem,
doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement, doc = elem.ownerDocument, computedStyle, docElem = doc.documentElement,
body = doc.body, defaultView = doc.defaultView, body = doc.body, defaultView = doc.defaultView,
prevComputedStyle = defaultView.getComputedStyle(elem, null), prevComputedStyle = defaultView.getComputedStyle( elem, null ),
top = elem.offsetTop, left = elem.offsetLeft; top = elem.offsetTop, left = elem.offsetLeft;
while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) { while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
...@@ -100,7 +110,7 @@ jQuery.offset = { ...@@ -100,7 +110,7 @@ jQuery.offset = {
jQuery.offset.initialize = function(){}; jQuery.offset.initialize = function(){};
}, },
bodyOffset: function(body) { bodyOffset: function( body ) {
var top = body.offsetTop, left = body.offsetLeft; var top = body.offsetTop, left = body.offsetLeft;
jQuery.offset.initialize(); jQuery.offset.initialize();
...@@ -111,6 +121,27 @@ jQuery.offset = { ...@@ -111,6 +121,27 @@ jQuery.offset = {
} }
return { top: top, left: left }; return { top: top, left: left };
},
setOffset: function( elem, options ) {
// set position first, in-case top/left are set even on static elem
if ( /static/.test( jQuery.curCSS( elem, 'position' ) ) ) {
elem.style.position = 'relative';
}
var curElem = jQuery( elem ),
curOffset = curElem.offset(),
curTop = parseInt( jQuery.curCSS( elem, 'top', true ), 10 ) || 0,
curLeft = parseInt( jQuery.curCSS( elem, 'left', true ), 10) || 0,
props = {
top: (options.top - curOffset.top) + curTop,
left: (options.left - curOffset.left) + curLeft
};
if ( 'using' in options ) {
options.using.call( elem, props );
} else {
curElem.css( props );
}
} }
}; };
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<title>relative</title> <title>relative</title>
<style type="text/css" media="screen"> <style type="text/css" media="screen">
body { margin: 1px; padding: 5px; } body { margin: 1px; padding: 5px; }
div.relative { position: relative; margin: 1px; border: 2px solid #000; padding: 5px; width: 100px; height: 100px; background: #fff; overflow: hidden; } div.relative { position: relative; top: 0; left: 0; margin: 1px; border: 2px solid #000; padding: 5px; width: 100px; height: 100px; background: #fff; overflow: hidden; }
#relative-2 { top: 20px; left: 20px; } #relative-2 { top: 20px; left: 20px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; } #marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style> </style>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<title>static</title> <title>static</title>
<style type="text/css" media="screen"> <style type="text/css" media="screen">
body { margin: 1px; padding: 5px; } body { margin: 1px; padding: 5px; }
div.static { position: static; margin: 1px; border: 2px solid #000; padding: 5px; width: 100px; height: 100px; background: #fff; overflow: hidden; } div.static { position: static; top: 0; left: 0; margin: 1px; border: 2px solid #000; padding: 5px; width: 100px; height: 100px; background: #fff; overflow: hidden; }
#static-2 { top: 20px; left: 20px; } #static-2 { top: 20px; left: 20px; }
#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; } #marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
</style> </style>
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment