Skip to content
Permalink
Browse files

fixed offset(coordinates) returns null when no matching elements in j…

…Query object (fixes ticket #5888)
  • Loading branch information
Karl Swedberg authored and jeresig committed Jan 21, 2010
1 parent a63754a commit 2c28f229e5eb49f1469fd36ee979529a492f0f42
Showing with 16 additions and 10 deletions.
  1. +8 −8 src/offset.js
  2. +1 −2 test/unit/effects.js
  3. +7 −0 test/unit/offset.js
@@ -2,16 +2,16 @@ if ( "getBoundingClientRect" in document.documentElement ) {
jQuery.fn.offset = function( options ) {
var elem = this[0];

if ( !elem || !elem.ownerDocument ) {
return null;
}

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

if ( !elem || !elem.ownerDocument ) {
return null;
}

if ( elem === elem.ownerDocument.body ) {
return jQuery.offset.bodyOffset( elem );
}
@@ -28,16 +28,16 @@ if ( "getBoundingClientRect" in document.documentElement ) {
jQuery.fn.offset = function( options ) {
var elem = this[0];

if ( !elem || !elem.ownerDocument ) {
return null;
}

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

if ( !elem || !elem.ownerDocument ) {
return null;
}

if ( elem === elem.ownerDocument.body ) {
return jQuery.offset.bodyOffset( elem );
}
@@ -29,9 +29,8 @@ test("show()", function() {
div.hide().show(speed, function() {
pass = false;
});
ok( pass, "Show with " + name + " does not call animate callback");
ok( pass, "Show with " + name + " does not call animate callback" );
});


jQuery("#main").append('<div id="show-tests"><div><p><a href="#"></a></p><code></code><pre></pre><span></span></div><table><thead><tr><th></th></tr></thead><tbody><tr><td></td></tr></tbody></table><ul><li></li></ul></div>');

@@ -305,6 +305,13 @@ testoffset("body", function( jQuery ) {
equals( jQuery('body').offset().left, 1, "jQuery('#body').offset().left" );
});

test("Chaining offset(coords) returns jQuery object", function() {
expect(2);
var coords = { top: 1, left: 1 };
equals( jQuery("#absolute-1").offset(coords).selector, "#absolute-1", "offset(coords) returns jQuery object" );
equals( jQuery("#non-existent").offset(coords).selector, "#non-existent", "offset(coords) with empty jQuery set returns jQuery object" );
});

test("offsetParent", function(){
expect(11);

0 comments on commit 2c28f22

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