deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:jquery/jquery

Browse source
This commit is contained in:
jeresig 2010-01-23 12:52:39 -05:00
commit 8ea634fd07
4 changed files with 40 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/effects.js vendored
View file

@ -13,7 +13,7 @@ var elemdisplay = {},
jQuery.fn.extend({
show: function( speed, callback ) {
if ( speed != null ) {
if ( speed || speed === 0) {
return this.animate( genFx("show", 3), speed, callback);
} else {
@ -57,7 +57,7 @@ jQuery.fn.extend({
},
hide: function( speed, callback ) {
if ( speed != null ) {
if ( speed || speed === 0 ) {
return this.animate( genFx("hide", 3), speed, callback);
} else {

16
src/offset.js
View file

@ -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 );
}