diff options
| author | Colin Snover <github.com@zetafleet.com> | 2010-10-05 13:32:07 -0500 |
|---|---|---|
| committer | Colin Snover <github.com@zetafleet.com> | 2010-10-05 13:32:07 -0500 |
| commit | 69e4f2535bb8c1fd373ab805aad969cce4e95573 (patch) | |
| tree | 3bf1e6f20cd5e3001c2e351393c269dccbe92d2c /src/effects.js | |
| parent | 0cdcef5b364fa3c89d7f27935e77b453f4a56efd (diff) | |
| download | jquery-69e4f2535bb8c1fd373ab805aad969cce4e95573.tar.gz jquery-69e4f2535bb8c1fd373ab805aad969cce4e95573.zip | |
Update $.fn.animate to restore overflow-x and overflow-y separately. Fixes #7111.
Diffstat (limited to 'src/effects.js')
| -rw-r--r-- | src/effects.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/effects.js b/src/effects.js index 3257ac395..e4893d6fb 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 @@ -400,7 +403,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 |