Skip to content
Permalink
Browse files

Added in support for .offset(Function).

  • Loading branch information
jeresig committed Jan 7, 2010
1 parent ebaf374 commit 4fa00369f00b8ee708c8962135b7aa345e3d30d0
Showing with 38 additions and 26 deletions.
  1. +15 −10 src/offset.js
  2. +23 −16 test/unit/offset.js
@@ -7,8 +7,8 @@ if ( "getBoundingClientRect" in document.documentElement ) {
}

if ( options ) {
return this.each(function() {
jQuery.offset.setOffset( this, options );
return this.each(function( i ) {
jQuery.offset.setOffset( this, i, options );
});
}

@@ -33,8 +33,8 @@ if ( "getBoundingClientRect" in document.documentElement ) {
}

if ( options ) {
return this.each(function() {
jQuery.offset.setOffset( this, options );
return this.each(function( i ) {
jQuery.offset.setOffset( this, i, options );
});
}

@@ -137,19 +137,24 @@ jQuery.offset = {
return { top: top, left: left };
},

setOffset: function( elem, options ) {
setOffset: function( elem, i, 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
};
curLeft = parseInt( jQuery.curCSS( elem, "left", true ), 10 ) || 0;

if ( jQuery.isFunction( options ) ) {
options = options.call( elem, i, curOffset );
}

var props = {
top: (options.top - curOffset.top) + curTop,
left: (options.left - curOffset.left) + curLeft
};

if ( "using" in options ) {
options.using.call( elem, props );
@@ -1,6 +1,8 @@
module("offset");

testoffset("absolute", function( jQuery ) {
expect(144);

// get offset tests
var tests = [
{ id: '#absolute-1', top: 1, left: 1 },
@@ -51,6 +53,16 @@ testoffset("absolute", function( jQuery ) {
equals( jQuery( this.id ).offset().top, this.top, "jQuery('" + this.id + "').offset({ top: " + this.top + " })" );
equals( jQuery( this.id ).offset().left, this.left, "jQuery('" + this.id + "').offset({ left: " + this.left + " })" );

var top = this.top, left = this.left;

jQuery( this.id ).offset(function(i, val){
equals( val.top, top, "Verify incoming top position." );
equals( val.left, left, "Verify incoming top position." );
return { top: top + 1, left: left + 1 };
});
equals( jQuery( this.id ).offset().top, this.top + 1, "jQuery('" + this.id + "').offset({ top: " + this.top + " })" );
equals( jQuery( this.id ).offset().left, this.left + 1, "jQuery('" + this.id + "').offset({ left: " + this.left + " })" );

jQuery( this.id ).offset({ top: this.top, left: this.left, using: function( props ) {
jQuery( this ).css({
top: props.top + 1,
@@ -63,6 +75,8 @@ testoffset("absolute", function( jQuery ) {
});

testoffset("relative", function( jQuery ) {
expect(60);

// IE is collapsing the top margin of 1px
var ie = jQuery.browser.msie && parseInt( jQuery.browser.version ) < 8;

@@ -122,6 +136,8 @@ testoffset("relative", function( jQuery ) {
});

testoffset("static", function( jQuery ) {
expect(80);

// IE is collapsing the top margin of 1px
var ie = jQuery.browser.msie && parseInt( jQuery.browser.version ) < 8;

@@ -187,6 +203,8 @@ testoffset("static", function( jQuery ) {
});

testoffset("fixed", function( jQuery ) {
expect(28);

jQuery.offset.initialize();

var tests = [
@@ -238,31 +256,18 @@ testoffset("fixed", function( jQuery ) {
});

testoffset("table", function( jQuery ) {
var ie = jQuery.browser.msie;
expect(4);

equals( jQuery('#table-1').offset().top, 6, "jQuery('#table-1').offset().top" );
equals( jQuery('#table-1').offset().left, 6, "jQuery('#table-1').offset().left" );

equals( jQuery('#th-1').offset().top, 10, "jQuery('#th-1').offset().top" );
equals( jQuery('#th-1').offset().left, 10, "jQuery('#th-1').offset().left" );

// equals( jQuery('#th-2').offset().top, 10, "jQuery('#th-2').offset().top" );
// equals( jQuery('#th-2').offset().left, 116, "jQuery('#th-2').offset().left" );
//
// equals( jQuery('#th-3').offset().top, 10, "jQuery('#th-3').offset().top" );
// equals( jQuery('#th-3').offset().left, 222, "jQuery('#th-3').offset().left" );

// equals( jQuery('#td-1').offset().top, ie ? 116 : 112, "jQuery('#td-1').offset().top" );
// equals( jQuery('#td-1').offset().left, 10, "jQuery('#td-1').offset().left" );
//
// equals( jQuery('#td-2').offset().top, ie ? 116 : 112, "jQuery('#td-2').offset().top" );
// equals( jQuery('#td-2').offset().left, 116, "jQuery('#td-2').offset().left" );
//
// equals( jQuery('#td-3').offset().top, ie ? 116 : 112, "jQuery('#td-3').offset().top" );
// equals( jQuery('#td-3').offset().left, 222, "jQuery('#td-3').offset().left" );
});

testoffset("scroll", function( jQuery, win ) {
expect(12);

var ie = jQuery.browser.msie && parseInt( jQuery.browser.version ) < 8;

// IE is collapsing the top margin of 1px
@@ -294,6 +299,8 @@ testoffset("scroll", function( jQuery, win ) {
});

testoffset("body", function( jQuery ) {
expect(2);

equals( jQuery('body').offset().top, 1, "jQuery('#body').offset().top" );
equals( jQuery('body').offset().left, 1, "jQuery('#body').offset().left" );
});

0 comments on commit 4fa0036

Please sign in to comment.
You can’t perform that action at this time.