git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes #7945. Make jQuery.param() serialize plain objects with a property named jquery...
[jquery.git]
/
src
/
offset.js
diff --git
a/src/offset.js
b/src/offset.js
index
3fb2917
..
a10d30a
100644
(file)
--- a/
src/offset.js
+++ b/
src/offset.js
@@
-7,7
+7,7
@@
if ( "getBoundingClientRect" in document.documentElement ) {
jQuery.fn.offset = function( options ) {
var elem = this[0], box;
jQuery.fn.offset = function( options ) {
var elem = this[0], box;
- if ( options ) {
+ if ( options ) {
return this.each(function( i ) {
jQuery.offset.setOffset( this, options, i );
});
return this.each(function( i ) {
jQuery.offset.setOffset( this, options, i );
});
@@
-30,7
+30,7
@@
if ( "getBoundingClientRect" in document.documentElement ) {
// Make sure we're not dealing with a disconnected DOM node
if ( !box || !jQuery.contains( docElem, elem ) ) {
// Make sure we're not dealing with a disconnected DOM node
if ( !box || !jQuery.contains( docElem, elem ) ) {
- return box || { top: 0, left: 0 };
+ return box ? { top: box.top, left: box.left } : { top: 0, left: 0 };
}
var body = doc.body,
}
var body = doc.body,
@@
-49,7
+49,7
@@
if ( "getBoundingClientRect" in document.documentElement ) {
jQuery.fn.offset = function( options ) {
var elem = this[0];
jQuery.fn.offset = function( options ) {
var elem = this[0];
- if ( options ) {
+ if ( options ) {
return this.each(function( i ) {
jQuery.offset.setOffset( this, options, i );
});
return this.each(function( i ) {
jQuery.offset.setOffset( this, options, i );
});
@@
-168,7
+168,7
@@
jQuery.offset = {
return { top: top, left: left };
},
return { top: top, left: left };
},
-
+
setOffset: function( elem, options, i ) {
var position = jQuery.css( elem, "position" );
setOffset: function( elem, options, i ) {
var position = jQuery.css( elem, "position" );
@@
-202,7
+202,7
@@
jQuery.offset = {
if (options.left != null) {
props.left = (options.left - curOffset.left) + curLeft;
}
if (options.left != null) {
props.left = (options.left - curOffset.left) + curLeft;
}
-
+
if ( "using" in options ) {
options.using.call( elem, props );
} else {
if ( "using" in options ) {
options.using.call( elem, props );
} else {
@@
-262,7
+262,7
@@
jQuery.each( ["Left", "Top"], function( i, name ) {
jQuery.fn[ method ] = function(val) {
var elem = this[0], win;
jQuery.fn[ method ] = function(val) {
var elem = this[0], win;
-
+
if ( !elem ) {
return null;
}
if ( !elem ) {
return null;
}