Fix #10877. Make outerWidth/Height a setter. Closes gh-783.

2 files changed, 76 insertions, 60 deletions

diff --git a/src/css.js b/src/css.js
index ba0042dff..4858338ba 100644
--- a/src/css.js
+++ b/src/css.js
@@ -1,5 +1,6 @@
 (function( jQuery ) {
 
+// order is important!
 jQuery.cssExpand = [ "Top", "Right", "Bottom", "Left" ];
 
 var ralpha = /alpha\([^)]*\)/i,
@@ -13,7 +14,6 @@ var ralpha = /alpha\([^)]*\)/i,
 
 	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
 
-	// order is important!
 	cssExpand = jQuery.cssExpand,
 	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ],
 
@@ -127,7 +127,7 @@ jQuery.extend({
 			}
 
 			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
+			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value, extra )) !== undefined ) {
 				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
 				// Fixes bug #5509
 				try {
@@ -266,19 +266,57 @@ if ( document.defaultView && document.defaultView.getComputedStyle ) {
 	};
 }
 
-function setPositiveNumber( elem, value ) {
+function setPositiveNumber( elem, value, subtract ) {
 	var matches = rnumsplit.exec( value );
 	return matches ?
-			Math.max( 0, matches[ 1 ] ) + ( matches [ 2 ] || "px" )
+			Math.max( 0, +matches[ 1 ] - ( subtract || 0 ) ) + ( matches [ 2 ] || "px" )
 			: value;
 }
 
+function augmentWidthOrHeight( name, elem, extra, isBorderBox ) {
+	var val = 0,
+		i = name === "width" ? 1 : 0;
+
+	// if the measurement we need is already represented by the measurement
+	// there's no need to augment further
+	if ( extra !== (isBorderBox ? "border" : "content") ) {
+		for ( ; i < 4; i += 2 ) {
+			// both box models exclude margin, so add it if we want it
+			if ( extra === "margin" ) {
+				// we use jQuery.css instead of curCSS here
+				// because of the reliableMarginRight CSS hook!
+				val += parseFloat( jQuery.css( elem, extra + cssExpand[ i ] ) ) || 0;
+			}
+
+			if ( isBorderBox ) {
+				// border-box includes padding, so remove it if we want content
+				if ( extra === "content" ) {
+					val -= parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0;
+				}
+
+				// at this point, extra isnt border nor margin, so remove border
+				if ( extra !== "margin" ) {
+					val -= parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
+				}
+			} else {
+				// at this point, extra isnt content, so add padding
+				val += parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0;
+
+				// at this point, extra isnt content nor padding, so add border
+				if ( extra !== "padding" ) {
+					val += parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
+				}
+			}
+		}
+	}
+
+	return val;
+}
+
 function getWidthOrHeight( elem, name, extra ) {
 
 	// Start with offset property, which is equivalent to the border-box value
 	var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		i = name === "width" ? 1 : 0,
-		len = 4,
 		valueIsBorderBox = true,
 		isBorderBox = jQuery.support.boxSizing && jQuery.css( elem, "boxSizing" ) === "border-box";
 
@@ -307,38 +345,7 @@ function getWidthOrHeight( elem, name, extra ) {
 		extra = isBorderBox ? "border" : "content";
 	}
 
-	// if the measurement we need is already represented by the retrieved width
-	// there's no need to augment further
-	if ( extra !== (valueIsBorderBox ? "border" : "content") ) {
-		for ( ; i < len; i += 2 ) {
-			// both box models exclude margin, so add it if we want it
-			if ( extra === "margin" ) {
-				// we use jQuery.css instead of curCSS here
-				// because of the reliableMarginRight CSS hook!
-				val += parseFloat( jQuery.css( elem, extra + cssExpand[ i ] ) ) || 0;
-			}
-
-			if ( valueIsBorderBox ) {
-				// border-box includes padding, so remove it if we want content
-				if ( extra === "content" ) {
-					val -= parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0;
-				}
-
-				// at this point, extra isnt border nor margin, so remove border
-				if ( extra !== "margin" ) {
-					val -= parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
-				}
-			} else {
-				// at this point, extra isnt content, so add padding
-				val += parseFloat( curCSS( elem, "padding" + cssExpand[ i ] ) ) || 0;
-
-				// at this point, extra isnt content nor padding, so add border
-				if ( extra !== "padding" ) {
-					val += parseFloat( curCSS( elem, "border" + cssExpand[ i ] + "Width" ) ) || 0;
-				}
-			}
-		}
-	}
+	val += augmentWidthOrHeight( name, elem, extra, valueIsBorderBox );
 
 	return val + "px";
 }
@@ -357,7 +364,16 @@ jQuery.each([ "height", "width" ], function( i, name ) {
 			}
 		},
 
-		set: setPositiveNumber
+		set: function( elem, value, extra ) {
+			return setPositiveNumber( elem, value, extra ?
+				augmentWidthOrHeight(
+					name,
+					elem,
+					extra,
+					jQuery.support.boxSizing && jQuery.css( elem, "boxSizing" ) === "border-box"
+				) : 0
+			);
+		}
 	};
 });
 
diff --git a/src/dimensions.js b/src/dimensions.js
index d4d7915ff..79d7c22bc 100644
--- a/src/dimensions.js
+++ b/src/dimensions.js
@@ -6,27 +6,27 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 		scrollProp = "scroll" + name,
 		offsetProp = "offset" + name;
 
-	// innerHeight and innerWidth
-	jQuery.fn[ "inner" + name ] = function() {
-		var elem = this[0];
-		return elem ?
-			elem.style ?
-			parseFloat( jQuery.css( elem, type, "padding" ) ) :
-			this[ type ]() :
-			null;
-	};
+	// height, width, innerHeight and innerWidth
+	jQuery.each( { padding: "inner" + name, content: type }, function( extra, funcName ) {
+		jQuery.fn[ funcName ] = function( value ) {
+			var args = [ type, extra ];
+			if ( arguments.length ) {
+				args.push( value );
+			}
+			return getDimension.apply( this, args );
+		};
+	});
 
 	// outerHeight and outerWidth
-	jQuery.fn[ "outer" + name ] = function( margin ) {
-		var elem = this[0];
-		return elem ?
-			elem.style ?
-			parseFloat( jQuery.css( elem, type, margin ? "margin" : "border" ) ) :
-			this[ type ]() :
-			null;
+	jQuery.fn[ "outer" + name ] = function( margin, value ) {
+		var args = [ type, ( margin === true || value === true ) ? "margin" : "border" ];
+		if ( arguments.length && typeof margin !== "boolean" ) {
+			args.push( margin );
+		}
+		return getDimension.apply( this, args );
 	};
 
-	jQuery.fn[ type ] = function( value ) {
+	function getDimension( type, extra, value ) {
 		return jQuery.access( this, function( elem, type, value ) {
 			var doc, orig, ret;
 
@@ -58,15 +58,15 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 
 			// Get width or height on the element
 			if ( value === undefined ) {
-				orig = jQuery.css( elem, type, "content" );
+				orig = jQuery.css( elem, type, extra );
 				ret = parseFloat( orig );
 				return jQuery.isNumeric( ret ) ? ret : orig;
 			}
 
 			// Set the width or height on the element
-			jQuery.style( elem, type, value );
-		}, type, value, arguments.length, null );
-	};
+			jQuery.style( elem, type, value, extra );
+		}, type, value, arguments.length > 2, null );
+	}
 });
 
 })( jQuery );