X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Feffects.js;h=5d574a8fff0efe16bcb7968ca7a28a31f1bd5fb8;hb=329b750af6649b3755920144bf1d52bfc3a42a0e;hp=3257ac3955e7cd762da725a78fada0e492d29fad;hpb=0cdcef5b364fa3c89d7f27935e77b453f4a56efd;p=jquery.git diff --git a/src/effects.js b/src/effects.js index 3257ac3..5d574a8 100644 --- a/src/effects.js +++ b/src/effects.js @@ -133,7 +133,10 @@ jQuery.fn.extend({ if ( ( p === "height" || p === "width" ) ) { // Make sure that nothing sneaks out - opt.overflow = this.style.overflow; + // Record all 3 overflow attributes because IE does not + // change the overflow attribute when overflowX and + // overflowY are set to the same value + opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ]; // Set display property to inline-block for height/width // animations on inline elements that are having width/height @@ -152,7 +155,6 @@ jQuery.fn.extend({ } else { this.style.display = "inline"; - jQuery.data( this, "oldzoom", this.style.zoom ); this.style.zoom = 1; } } @@ -400,7 +402,9 @@ jQuery.fx.prototype = { if ( done ) { // Reset the overflow if ( this.options.overflow != null ) { - this.elem.style.overflow = this.options.overflow; + this.elem.style.overflow = this.options.overflow[0]; + this.elem.style.overflowX = this.options.overflow[1]; + this.elem.style.overflowY = this.options.overflow[2]; } // Hide the element if the "hide" operation was done @@ -453,14 +457,14 @@ jQuery.extend( jQuery.fx, { jQuery.fx.stop(); } }, - + interval: 13, - + stop: function() { clearInterval( timerId ); timerId = null; }, - + speeds: { slow: 600, fast: 200,