diff options
| author | John Resig <jeresig@gmail.com> | 2010-09-13 18:00:28 -0400 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2010-09-13 18:00:28 -0400 |
| commit | 2bda99c18a0372eed02472e9d318676e180281da (patch) | |
| tree | 25078fc1d58aa9fe42db0eecd3783c6ceb39f002 /src | |
| parent | 8b7015987cbd24c79f328bcf9260a6596a785bf5 (diff) | |
| download | jquery-2bda99c18a0372eed02472e9d318676e180281da.tar.gz jquery-2bda99c18a0372eed02472e9d318676e180281da.zip | |
Making some more adjustments to handle auto CSS properties.
Diffstat (limited to 'src')
| -rw-r--r-- | src/css.js | 2 | ||||
| -rw-r--r-- | src/effects.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/css.js b/src/css.js index b95eb47d0..eb7567f79 100644 --- a/src/css.js +++ b/src/css.js @@ -77,7 +77,7 @@ jQuery.extend({ } else if ( !force && style[ name ] ) { ret = style[ name ]; - } else if ( curCSS ) { + } else if ( force !== false && curCSS ) { ret = curCSS( elem, name, origName ); } diff --git a/src/effects.js b/src/effects.js index 352ad4aea..4eb725bd9 100644 --- a/src/effects.js +++ b/src/effects.js @@ -349,7 +349,7 @@ jQuery.fx.prototype = { // Simple 'show' function show: function() { // Remember where we started, so that we can go back to it later - this.options.orig[this.prop] = jQuery.css( this.elem, this.prop ); + this.options.orig[this.prop] = jQuery.css( this.elem, this.prop, undefined, false ); this.options.show = true; // Begin the animation @@ -364,7 +364,7 @@ jQuery.fx.prototype = { // Simple 'hide' function hide: function() { // Remember where we started, so that we can go back to it later - this.options.orig[this.prop] = jQuery.css( this.elem, this.prop ); + this.options.orig[this.prop] = jQuery.css( this.elem, this.prop, undefined, false ); this.options.hide = true; // Begin the animation |