Derp, had parseInt on the brain. Thanks karbassi in 6541eb9d80db42c6ced396fcd198228bf...

[jquery.git] / src / effects.js

diff --git a/src/effects.js b/src/effects.js
index 73d94ef..d3ac99a 100644 (file)
--- a/src/effects.js
+++ b/src/effects.js
@@ -3,7 +3,6 @@
 var elemdisplay = {},
        rfxtypes = /toggle|show|hide/,
        rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
-       rdashAlpha = /-([a-z])/ig,
        timerId,
        fxAttrs = [
                // height animations
@@ -12,11 +11,7 @@ var elemdisplay = {},
                [ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
                // opacity animations
                [ "opacity" ]
-       ],
-
-       fcamelCase = function( all, letter ) {
-               return letter.toUpperCase();
-       };
+       ];
 
 jQuery.fn.extend({
        show: function( speed, callback ) {
@@ -29,7 +24,7 @@ jQuery.fn.extend({
 
                                this[i].style.display = old || "";
 
-                               if ( jQuery.css(this[i], "display") === "none" ) {
+                               if ( jQuery.css( this[i], "display" ) === "none" ) {
                                        var nodeName = this[i].nodeName, display;
 
                                        if ( elemdisplay[ nodeName ] ) {
@@ -71,7 +66,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" ) );
                                }
                        }
 
@@ -125,7 +120,7 @@ jQuery.fn.extend({
                                self = this;
 
                        for ( p in prop ) {
-                               var name = p.replace(rdashAlpha, fcamelCase);
+                               var name = jQuery.camelCase( p );
 
                                if ( p !== name ) {
                                        prop[ name ] = prop[ p ];
@@ -139,7 +134,7 @@ jQuery.fn.extend({
 
                                if ( ( p === "height" || p === "width" ) && this.style ) {
                                        // Store display property
-                                       opt.display = jQuery.css(this, "display");
+                                       opt.display = this.style.display;
 
                                        // Make sure that nothing sneaks out
                                        opt.overflow = this.style.overflow;
@@ -316,13 +311,13 @@ jQuery.fx.prototype = {
        },
 
        // Get the current size
-       cur: function( force ) {
+       cur: function() {
                if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
                        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 ) );
+               return r && r > -10000 ? r : 0;
        },
 
        // Start an animation from one number to another
@@ -397,7 +392,7 @@ jQuery.fx.prototype = {
                                        var old = jQuery.data(this.elem, "olddisplay");
                                        this.elem.style.display = old ? old : this.options.display;
 
-                                       if ( jQuery.css(this.elem, "display") === "none" ) {
+                                       if ( jQuery.css( this.elem, "display" ) === "none" ) {
                                                this.elem.style.display = "block";
                                        }
                                }
@@ -410,7 +405,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.style( this.elem, p, this.options.orig[p] );
                                        }
                                }
 
@@ -467,7 +462,7 @@ jQuery.extend( jQuery.fx, {
 
        step: {
                opacity: function( fx ) {
-                       jQuery.style(fx.elem, "opacity", fx.now);
+                       jQuery.style( fx.elem, "opacity", fx.now );
                },
 
                _default: function( fx ) {