Merge branch 'bug_7397' of https://github.com/rwldrn/jquery into rwldrn-bug_7397

diff --combined src/effects.js
index 067383b,98f969f..6007074
--- 1/src/effects.js
--- 2/src/effects.js
+++ b/src/effects.js
@@@ -2,7 -2,7 +2,7 @@@
  
  var elemdisplay = {},
        rfxtypes = /^(?:toggle|show|hide)$/,
 -      rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
 +      rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
        timerId,
        fxAttrs = [
                // height animations
@@@ -61,8 -61,8 +61,8 @@@ jQuery.fn.extend(
                } else {
                        for ( var i = 0, j = this.length; i < j; i++ ) {
                                var display = jQuery.css( this[i], "display" );
- 
-                               if ( display !== "none" ) {
+         
+                               if ( display !== "none" && !jQuery.data( this[i], "olddisplay" ) ) {
                                        jQuery.data( this[i], "olddisplay", display );
                                }
                        }