From: John Resig <jeresig@gmail.com>
Date: Tue, 21 Sep 2010 21:12:42 +0000 (-0400)
Subject: Make sure that non-px values aren't manipulated before input to height/width.
X-Git-Tag: 1.4.3rc1~93
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e3463946e19f2eb53d909fc2b59cc1c8636d21bd;p=jquery.git

Make sure that non-px values aren't manipulated before input to height/width.
---

diff --git a/src/css.js b/src/css.js
index 84b6e6023..69c4452b2 100644
--- a/src/css.js
+++ b/src/css.js
@@ -155,7 +155,7 @@ jQuery.each(["height", "width"], function( i, name ) {
 		},
 
 		set: function( elem, value ) {
-			if ( value !== "" ) {
+			if ( rnumpx.test( value ) ) {
 				// ignore negative width and height values #1599
 				value = parseFloat(value);
 
diff --git a/test/unit/css.js b/test/unit/css.js
index 99bab1fe5..0e91ae159 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,7 +1,7 @@
 module("css");
 
 test("css(String|Hash)", function() {
-	expect(28);
+	expect(29);
 
 	equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
 
@@ -44,6 +44,9 @@ test("css(String|Hash)", function() {
 	equals( parseInt(child.css("fontSize")), 16, "Verify fontSize px set." );
 	equals( parseInt(child.css("font-size")), 16, "Verify fontSize px set." );
 
+	child.css("height", "100%");
+	equals( child[0].style.height, "100%", "Make sure the height is being set correctly." );
+
 	child.attr("class", "em");
 	equals( parseInt(child.css("fontSize")), 32, "Verify fontSize em set." );