aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjeresig <jeresig@gmail.com>2009-12-05 21:06:14 -0500
committerjeresig <jeresig@gmail.com>2009-12-05 21:06:14 -0500
commit3c89e38fc26ef40797b83ba8ef4f8329b08afe75 (patch)
tree91338a29b8198dadc3e4c4cd013f307deebc3d96 /src
parent2d27e053a0e6ab4917a4f79918b58257600c5b82 (diff)
downloadjquery-3c89e38fc26ef40797b83ba8ef4f8329b08afe75.tar.gz
jquery-3c89e38fc26ef40797b83ba8ef4f8329b08afe75.zip
Make sure that animated show resets the display correctly. Fixes #5130.
Diffstat (limited to 'src')
-rw-r--r--src/fx.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/fx.js b/src/fx.js
index fa1707294..529fd4cde 100644
--- a/src/fx.js
+++ b/src/fx.js
@@ -359,7 +359,9 @@ jQuery.fx.prototype = {
this.elem.style.overflow = this.options.overflow;
// Reset the display
- this.elem.style.display = this.options.display;
+ var old = jQuery.data(this.elem, "olddisplay");
+ this.elem.style.display = old ? old : this.options.display;
+
if ( jQuery.css(this.elem, "display") == "none" ) {
this.elem.style.display = "block";
}