aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohn Resig <jeresig@gmail.com>2010-10-11 16:40:10 -0400
committerJohn Resig <jeresig@gmail.com>2010-10-11 16:40:10 -0400
commit5f30ae3b6fa89c3cc00c8c67305c84f21f76aa68 (patch)
tree6f4e18e555653df0b0e269a60516f5382c2f8c2d /src
parent22ccbf82c8badd1d46f5ea52a0a7d5f3935a9fca (diff)
parent5646a4feee87b086fa4752373422622d54a8430d (diff)
downloadjquery-5f30ae3b6fa89c3cc00c8c67305c84f21f76aa68.tar.gz
jquery-5f30ae3b6fa89c3cc00c8c67305c84f21f76aa68.zip
Merge branch 'bug7141' of http://github.com/csnover/jquery into csnover-bug7141
Diffstat (limited to 'src')
-rw-r--r--src/effects.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/effects.js b/src/effects.js
index 241dbd036..8662df5b9 100644
--- a/src/effects.js
+++ b/src/effects.js
@@ -49,9 +49,10 @@ jQuery.fn.extend({
} else {
for ( var i = 0, j = this.length; i < j; i++ ) {
- var old = jQuery.data(this[i], "olddisplay");
- if ( !old ) {
- jQuery.data( this[i], "olddisplay", jQuery.css( this[i], "display" ) );
+ var display = jQuery.css( this[i], "display" );
+
+ if ( display !== "none" ) {
+ jQuery.data( this[i], "olddisplay", display );
}
}