Merge branch 'master' into csshooks

Conflicts:
	src/css.js

diff --git a/src/attributes.js b/src/attributes.js
index 73b4cdf..4fa49b9 100644 (file)
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -341,10 +341,6 @@ jQuery.extend({
                        // Non-existent attributes return null, we normalize to undefined
                        return attr === null ? undefined : attr;
                }
-
-               // elem is actually elem.style ... set the style
-               // Using attr for specific style information is now deprecated. Use style instead.
-               return jQuery.style( elem, name, value );
        }
 });
 

diff --git a/src/css.js b/src/css.js
index ae6853e..f263de8 100644 (file)
--- a/src/css.js
+++ b/src/css.js
@@ -1,89 +1,115 @@
 (function( jQuery ) {
 
-// exclude the following css properties to add px
-var rexclude = /z-?index|font-?weight|opacity|zoom|line-?height/i,
-       ralpha = /alpha\([^)]*\)/,
+var ralpha = /alpha\([^)]*\)/,
        ropacity = /opacity=([^)]*)/,
-       rfloat = /float/i,
        rdashAlpha = /-([a-z])/ig,
        rupper = /([A-Z])/g,
        rnumpx = /^-?\d+(?:px)?$/i,
        rnum = /^-?\d/,
 
-       cssShow = { position: "absolute", visibility: "hidden", display:"block" },
+       cssShow = { position: "absolute", visibility: "hidden", display: "block" },
        cssWidth = [ "Left", "Right" ],
        cssHeight = [ "Top", "Bottom" ],
+       curCSS,
 
        // cache check for defaultView.getComputedStyle
        getComputedStyle = document.defaultView && document.defaultView.getComputedStyle,
-       // normalize float css property
-       styleFloat = jQuery.support.cssFloat ? "cssFloat" : "styleFloat",
+
        fcamelCase = function( all, letter ) {
                return letter.toUpperCase();
        };
 
 jQuery.fn.css = function( name, value ) {
        return jQuery.access( this, name, value, true, function( elem, name, value ) {
-               if ( value === undefined ) {
-                       return jQuery.curCSS( elem, name );
-               }
-               
-               if ( typeof value === "number" && !rexclude.test(name) ) {
-                       value += "px";
-               }
-
-               jQuery.style( elem, name, value );
+               return jQuery.css( elem, name, value );
        });
 };
 
 jQuery.extend({
-       style: function( elem, name, value ) {
+       cssHooks: {
+               opacity: {
+                       get: function( elem ) {
+                               // We should always get a number back from opacity
+                               var ret = curCSS( elem, "opacity", "opacity" );
+                               return ret === "" ? "1" : ret;
+                       }
+               }
+       },
+
+       // exclude the following css properties to add px
+       cssNumber: {
+               "zIndex": true,
+               "fontWeight": true,
+               "opacity": true,
+               "zoom": true,
+               "lineHeight": true
+       },
+
+       cssProps: {
+               // normalize float css property
+               "float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+       },
+
+       css: function( elem, name, value, force, extra ) {
                // don't set styles on text and comment nodes
                if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
                        return undefined;
                }
 
-               // ignore negative width and height values #1599
-               if ( (name === "width" || name === "height") && parseFloat(value) < 0 ) {
-                       value = undefined;
-               }
+               var ret, origName = name.replace( rdashAlpha, fcamelCase ),
+                       style = elem.style || {}, hooks = jQuery.cssHooks[ origName ] || {};
+
+               name = jQuery.cssProps[ origName ] || origName;
+
+               if ( value !== undefined ) {
+                       if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) {
+                               value += "px";
+                       }
 
-               var style = elem.style || elem, set = value !== undefined;
+                       if ( !("set" in hooks) || (value = hooks.set( elem, value )) === undefined ) {
+                               style[ name ] = value;
+                       }
 
-               // IE uses filters for opacity
-               if ( !jQuery.support.opacity && name === "opacity" && style.filter ) {
-                       if ( set ) {
-                               // IE has trouble with opacity if it does not have layout
-                               // Force it by setting the zoom level
-                               style.zoom = 1;
+               } else {
+                       if ( "get" in hooks && (ret = hooks.get( elem, force, extra )) !== undefined ) {
+                               return ret;
+                       }
 
-                               // Set the alpha filter to set the opacity
-                               var opacity = parseInt( value, 10 ) + "" === "NaN" ? "" : "alpha(opacity=" + value * 100 + ")";
-                               var filter = style.filter || jQuery.curCSS( elem, "filter" ) || "";
-                               style.filter = ralpha.test(filter) ? filter.replace(ralpha, opacity) : opacity;
+                       if ( !force && style && style[ name ] ) {
+                               ret = style[ name ];
+
+                       } else if ( curCSS ) {
+                               ret = curCSS( elem, name, origName );
                        }
 
-                       return style.filter && style.filter.indexOf("opacity=") >= 0 ?
-                               (parseFloat( ropacity.exec(style.filter)[1] ) / 100) + "":
-                               "";
+                       return ret;
                }
+       },
 
-               // Make sure we're using the right name for getting the float value
-               if ( rfloat.test( name ) ) {
-                       name = styleFloat;
+       // A method for quickly swapping in/out CSS properties to get correct calculations
+       swap: function( elem, options, callback ) {
+               var old = {};
+
+               // Remember the old values, and insert the new ones
+               for ( var name in options ) {
+                       old[ name ] = elem.style[ name ];
+                       elem.style[ name ] = options[ name ];
                }
 
-               name = name.replace(rdashAlpha, fcamelCase);
+               callback.call( elem );
 
-               if ( set ) {
-                       style[ name ] = value;
+               // Revert the old values
+               for ( name in options ) {
+                       elem.style[ name ] = old[ name ];
                }
+       }
+});
 
-               return style[ name ];
-       },
+jQuery.each(["height", "width"], function( i, name ) {
+       jQuery.cssHooks[ name ] = {
+               get: function( elem, force, extra ) {
+                       var val;
 
-       css: function( elem, name, force, extra ) {
-               if ( name === "width" || name === "height" ) {
                        if ( elem.offsetWidth !== 0 ) {
                                val = getWH( elem, name, extra );
 
@@ -93,106 +119,90 @@ jQuery.extend({
                                });
                        }
 
-                       return Math.max(0, Math.round(val));
-               }
-
-               return jQuery.curCSS( elem, name, force );
-       },
+                       return val;
+               },
 
-       curCSS: function( elem, name, force ) {
-               var ret, style = elem.style, filter;
-
-               // IE uses filters for opacity
-               if ( !jQuery.support.opacity && name === "opacity" && elem.currentStyle ) {
-                       ret = ropacity.test(elem.currentStyle.filter || "") ?
-                               (parseFloat(RegExp.$1) / 100) + "" :
-                               "";
-
-                       return ret === "" ?
-                               "1" :
-                               ret;
+               set: function( elem, value ) {
+                       // ignore negative width and height values #1599
+                       return Math.max( parseFloat(value), 0 ) + "px";
                }
+       };
+});
 
-               // Make sure we're using the right name for getting the float value
-               if ( rfloat.test( name ) ) {
-                       name = styleFloat;
-               }
+if ( !jQuery.support.opacity ) {
+       jQuery.cssHooks.opacity = {
+               get: function( elem, force ) {
+                       // IE uses filters for opacity
+                       return ropacity.test(elem.currentStyle.filter || "") ?
+                               (parseFloat(RegExp.$1) / 100) + "" :
+                               "1";
+               },
 
-               if ( !force && style && style[ name ] ) {
-                       ret = style[ name ];
+               set: function( elem, value ) {
+                       var style = elem.style;
 
-               } else if ( getComputedStyle ) {
+                       // IE has trouble with opacity if it does not have layout
+                       // Force it by setting the zoom level
+                       style.zoom = 1;
 
-                       // Only "float" is needed here
-                       if ( rfloat.test( name ) ) {
-                               name = "float";
-                       }
+                       // Set the alpha filter to set the opacity
+                       var opacity = parseInt( value, 10 ) + "" === "NaN" ?
+                               "" :
+                               "alpha(opacity=" + value * 100 + ")";
 
-                       name = name.replace( rupper, "-$1" ).toLowerCase();
+                       var filter = style.filter || jQuery.css( elem, "filter" ) || "";
 
-                       var defaultView = elem.ownerDocument.defaultView;
+                       style.filter = ralpha.test(filter) ?
+                               filter.replace(ralpha, opacity) :
+                               opacity;
+               }
+       };
+}
 
-                       if ( !defaultView ) {
-                               return null;
-                       }
+if ( getComputedStyle ) {
+       curCSS = function( elem, newName, name ) {
+               var ret, defaultView, computedStyle;
 
-                       var computedStyle = defaultView.getComputedStyle( elem, null );
+               name = name.replace( rupper, "-$1" ).toLowerCase();
 
-                       if ( computedStyle ) {
-                               ret = computedStyle.getPropertyValue( name );
-                       }
+               if ( !(defaultView = elem.ownerDocument.defaultView) ) {
+                       return undefined;
+               }
 
-                       // We should always get a number back from opacity
-                       if ( name === "opacity" && ret === "" ) {
-                               ret = "1";
-                       }
+               if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
+                       ret = computedStyle.getPropertyValue( name );
+               }
 
-               } else if ( elem.currentStyle ) {
-                       var camelCase = name.replace(rdashAlpha, fcamelCase);
+               return ret;
+       };
 
-                       ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ];
+} else if ( document.documentElement.currentStyle ) {
+       curCSS = function( elem, name ) {
+               var left, rsLeft, ret = elem.currentStyle[ name ], style = elem.style;
 
-                       // From the awesome hack by Dean Edwards
-                       // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+               // From the awesome hack by Dean Edwards
+               // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
 
-                       // If we're not dealing with a regular pixel number
-                       // but a number that has a weird ending, we need to convert it to pixels
-                       if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
-                               // Remember the original values
-                               var left = style.left, rsLeft = elem.runtimeStyle.left;
+               // If we're not dealing with a regular pixel number
+               // but a number that has a weird ending, we need to convert it to pixels
+               if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
+                       // Remember the original values
+                       left = style.left;
+                       rsLeft = elem.runtimeStyle.left;
 
-                               // Put in the new values to get a computed value out
-                               elem.runtimeStyle.left = elem.currentStyle.left;
-                               style.left = camelCase === "fontSize" ? "1em" : (ret || 0);
-                               ret = style.pixelLeft + "px";
+                       // Put in the new values to get a computed value out
+                       elem.runtimeStyle.left = elem.currentStyle.left;
+                       style.left = name === "fontSize" ? "1em" : (ret || 0);
+                       ret = style.pixelLeft + "px";
 
-                               // Revert the changed values
-                               style.left = left;
-                               elem.runtimeStyle.left = rsLeft;
-                       }
+                       // Revert the changed values
+                       style.left = left;
+                       elem.runtimeStyle.left = rsLeft;
                }
 
                return ret;
-       },
-
-       // A method for quickly swapping in/out CSS properties to get correct calculations
-       swap: function( elem, options, callback ) {
-               var old = {};
-
-               // Remember the old values, and insert the new ones
-               for ( var name in options ) {
-                       old[ name ] = elem.style[ name ];
-                       elem.style[ name ] = options[ name ];
-               }
-
-               callback.call( elem );
-
-               // Revert the old values
-               for ( name in options ) {
-                       elem.style[ name ] = old[ name ];
-               }
-       }
-});
+       };
+}
 
 function getWH( elem, name, extra ) {
        var which = name === "width" ? cssWidth : cssHeight,
@@ -204,14 +214,14 @@ function getWH( elem, name, extra ) {
 
        jQuery.each( which, function() {
                if ( !extra ) {
-                       val -= parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0;
+                       val -= parseFloat(jQuery.css( elem, "padding" + this, undefined, true)) || 0;
                }
 
                if ( extra === "margin" ) {
-                       val += parseFloat(jQuery.curCSS( elem, "margin" + this, true)) || 0;
+                       val += parseFloat(jQuery.css( elem, "margin" + this, undefined, true)) || 0;
 
                } else {
-                       val -= parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0;
+                       val -= parseFloat(jQuery.css( elem, "border" + this + "Width", undefined, true)) || 0;
                }
        });
 
@@ -227,7 +237,7 @@ if ( jQuery.expr && jQuery.expr.filters ) {
                        true :
                        width > 0 && height > 0 && !skip ?
                                false :
-                               jQuery.curCSS(elem, "display") === "none";
+                               jQuery.css(elem, "display") === "none";
        };
 
        jQuery.expr.filters.visible = function( elem ) {

diff --git a/src/dimensions.js b/src/dimensions.js
index de10832..58c16af 100644 (file)
--- a/src/dimensions.js
+++ b/src/dimensions.js
@@ -8,14 +8,14 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
        // innerHeight and innerWidth
        jQuery.fn["inner" + name] = function() {
                return this[0] ?
-                       jQuery.css( this[0], type, false, "padding" ) :
+                       jQuery.css( this[0], type, undefined, false, "padding" ) :
                        null;
        };
 
        // outerHeight and outerWidth
        jQuery.fn["outer" + name] = function( margin ) {
                return this[0] ?
-                       jQuery.css( this[0], type, false, margin ? "margin" : "border" ) :
+                       jQuery.css( this[0], type, undefined, false, margin ? "margin" : "border" ) :
                        null;
        };
 

diff --git a/src/effects.js b/src/effects.js
index 65b9e0f..130b676 100644 (file)
--- a/src/effects.js
+++ b/src/effects.js
@@ -66,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") );
                                }
                        }
 
@@ -316,8 +316,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 +344,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 +359,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 +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.css( this.elem, p, this.options.orig[p] );
                                        }
                                }
 
@@ -462,7 +462,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 ) {

diff --git a/src/offset.js b/src/offset.js
index c38a7f2..5d283aa 100644 (file)
--- a/src/offset.js
+++ b/src/offset.js
@@ -105,7 +105,7 @@ if ( "getBoundingClientRect" in document.documentElement ) {
 
 jQuery.offset = {
        initialize: function() {
-               var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.curCSS(body, "marginTop", true) ) || 0,
+               var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop", undefined, true) ) || 0,
                        html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
 
                jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
@@ -144,25 +144,25 @@ jQuery.offset = {
                jQuery.offset.initialize();
 
                if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
-                       top  += parseFloat( jQuery.curCSS(body, "marginTop",  true) ) || 0;
-                       left += parseFloat( jQuery.curCSS(body, "marginLeft", true) ) || 0;
+                       top  += parseFloat( jQuery.css(body, "marginTop", undefined, true) ) || 0;
+                       left += parseFloat( jQuery.css(body, "marginLeft", undefined, true) ) || 0;
                }
 
                return { top: top, left: left };
        },
        
        setOffset: function( elem, options, i ) {
-               var position = jQuery.curCSS( elem, "position" );
+               var position = jQuery.css( elem, "position" );
 
                // set position first, in-case top/left are set even on static elem
                if ( position === "static" ) {
                        elem.style.position = "relative";
                }
 
-               var curElem    = jQuery( elem ),
-                       curOffset  = curElem.offset(),
-                       curCSSTop  = jQuery.curCSS( elem, "top", true ),
-                       curCSSLeft = jQuery.curCSS( elem, "left", true ),
+               var curElem = jQuery( elem ),
+                       curOffset = curElem.offset(),
+                       curCSSTop = jQuery.css( elem, "top", undefined, true ),
+                       curCSSLeft = jQuery.css( elem, "left", undefined, true ),
                        calculatePosition = (position === "absolute" && jQuery.inArray('auto', [curCSSTop, curCSSLeft]) > -1),
                        props = {}, curPosition = {}, curTop, curLeft;
 
@@ -212,12 +212,12 @@ jQuery.fn.extend({
                // Subtract element margins
                // note: when an element has margin: auto the offsetLeft and marginLeft
                // are the same in Safari causing offset.left to incorrectly be 0
-               offset.top  -= parseFloat( jQuery.curCSS(elem, "marginTop",  true) ) || 0;
-               offset.left -= parseFloat( jQuery.curCSS(elem, "marginLeft", true) ) || 0;
+               offset.top  -= parseFloat( jQuery.css(elem, "marginTop", undefined, true) ) || 0;
+               offset.left -= parseFloat( jQuery.css(elem, "marginLeft", undefined, true) ) || 0;
 
                // Add offsetParent borders
-               parentOffset.top  += parseFloat( jQuery.curCSS(offsetParent[0], "borderTopWidth",  true) ) || 0;
-               parentOffset.left += parseFloat( jQuery.curCSS(offsetParent[0], "borderLeftWidth", true) ) || 0;
+               parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth", undefined, true) ) || 0;
+               parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth", undefined, true) ) || 0;
 
                // Subtract the two offsets
                return {

diff --git a/src/support.js b/src/support.js
index 75e89dd..febff15 100644 (file)
--- a/src/support.js
+++ b/src/support.js
@@ -134,7 +134,7 @@
 
        // release memory in IE
        root = script = div = all = a = null;
-})();
+})( jQuery );
 
 jQuery.props = {
        "for": "htmlFor",