Adding in a couple private variables to effects.js that were in css.js.

[jquery.git] / src / effects.js

diff --git a/src/effects.js b/src/effects.js
index 65b9e0f..352ad4a 100644 (file)
--- a/src/effects.js
+++ b/src/effects.js
@@ -3,6 +3,7 @@
 var elemdisplay = {},
        rfxtypes = /toggle|show|hide/,
        rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
+       rdashAlpha = /-([a-z])/ig,
        timerId,
        fxAttrs = [
                // height animations
@@ -11,7 +12,11 @@ var elemdisplay = {},
                [ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
                // opacity animations
                [ "opacity" ]
-       ];
+       ],
+
+       fcamelCase = function( all, letter ) {
+               return letter.toUpperCase();
+       };
 
 jQuery.fn.extend({
        show: function( speed, callback ) {
@@ -66,7 +71,7 @@ jQuery.fn.extend({
                        for ( var i = 0, l = this.length; i < l; i++ ) {
                                var old = jQuery.data(this[i], "olddisplay");
                                if ( !old && old !== "none" ) {
-                                       jQuery.data(this[i], "olddisplay", jQuery.css(this[i], "display"));
+                                       jQuery.data( this[i], "olddisplay", jQuery.css(this[i], "display") );
                                }
                        }
 
@@ -316,8 +321,8 @@ jQuery.fx.prototype = {
                        return this.elem[ this.prop ];
                }
 
-               var r = parseFloat(jQuery.css(this.elem, this.prop, force));
-               return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0;
+               var r = parseFloat(jQuery.css(this.elem, this.prop, undefined, force));
+               return r && r > -10000 ? r : parseFloat(jQuery.css(this.elem, this.prop)) || 0;
        },
 
        // Start an animation from one number to another
@@ -344,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.style( this.elem, this.prop );
+               this.options.orig[this.prop] = jQuery.css( this.elem, this.prop );
                this.options.show = true;
 
                // Begin the animation
@@ -359,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.style( this.elem, this.prop );
+               this.options.orig[this.prop] = jQuery.css( this.elem, this.prop );
                this.options.hide = true;
 
                // Begin the animation
@@ -405,7 +410,7 @@ jQuery.fx.prototype = {
                                // Reset the properties, if the item has been hidden or shown
                                if ( this.options.hide || this.options.show ) {
                                        for ( var p in this.options.curAnim ) {
-                                               jQuery.style(this.elem, p, this.options.orig[p]);
+                                               jQuery.css( this.elem, p, this.options.orig[p] );
                                        }
                                }
 
@@ -462,7 +467,7 @@ jQuery.extend( jQuery.fx, {
 
        step: {
                opacity: function( fx ) {
-                       jQuery.style(fx.elem, "opacity", fx.now);
+                       jQuery.css( fx.elem, "opacity", fx.now );
                },
 
                _default: function( fx ) {