From: Colin Snover <github.com@zetafleet.com>
Date: Tue, 14 Dec 2010 06:37:11 +0000 (-0600)
Subject: Merge branch 'bug_7397' of https://github.com/rwldrn/jquery into rwldrn-bug_7397
X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=commitdiff_plain;h=efcf1a79212de53b3eb21e4603b2c722befc767b;hp=-c

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

efcf1a79212de53b3eb21e4603b2c722befc767b
diff --combined src/effects.js
index 067383b,98f969f..6007074
--- a/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 );
  				}
  			}