aboutsummaryrefslogtreecommitdiffstats
path: root/src/offset.js
diff options
context:
space:
mode:
authorscottjehl <scott@scottjehl.com>2011-01-13 14:14:04 -0500
committerscottjehl <scott@scottjehl.com>2011-01-13 14:14:04 -0500
commit610ab137da38106f8c464f099a304ae3795c2231 (patch)
treee55254f034702e0213c51e062a3d4aba5291f4e9 /src/offset.js
parent18fa1fd9da12fd6a259b422f91b663d9fbdb181e (diff)
parenta8fa5f2ec1030bceb9a65d0237f0c92ae4e014dd (diff)
downloadjquery-610ab137da38106f8c464f099a304ae3795c2231.tar.gz
jquery-610ab137da38106f8c464f099a304ae3795c2231.zip
Merge branch 'master' of https://github.com/jquery/jquery
Diffstat (limited to 'src/offset.js')
-rw-r--r--src/offset.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/offset.js b/src/offset.js
index 3fb2917b2..2040c9d83 100644
--- 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;
- if ( options ) {
+ if ( options ) {
return this.each(function( i ) {
jQuery.offset.setOffset( this, options, i );
});
@@ -49,7 +49,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
jQuery.fn.offset = function( options ) {
var elem = this[0];
- if ( options ) {
+ if ( options ) {
return this.each(function( i ) {
jQuery.offset.setOffset( this, options, i );
});
@@ -168,7 +168,7 @@ jQuery.offset = {
return { top: top, left: left };
},
-
+
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 ( "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;
-
+
if ( !elem ) {
return null;
}