X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcss.js;h=71f883508da133e709086afa859db286b85a21b1;hb=fb4445070cd9e06929c7b6f27c10dbf42d4a3367;hp=2c2e9ed212a1af631e254eaba902c2cdf5ee976a;hpb=7e02cee5ff8b5e9117366d7b43af7b5794f0f258;p=jquery.git

diff --git a/test/unit/css.js b/test/unit/css.js
index 2c2e9ed..71f8835 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -13,8 +13,8 @@ test("css(String|Hash)", function() {
 
 	var div = jQuery( "<div>" );
 
-	equals( div.css("width") || "auto", "auto", "Width on disconnected node." );
-	equals( div.css("height") || "auto", "auto", "Height on disconnected node." );
+	equals( div.css("width"), "auto", "Width on disconnected node." );
+	equals( div.css("height"), "auto", "Height on disconnected node." );
 
 	div.css({ width: 4, height: 4 });
 
@@ -156,27 +156,27 @@ test("css(String, Object)", function() {
 });
 
 if ( !jQuery.support.opacity ) {
-  test("css(String, Object) for MSIE", function() {
-    // for #1438, IE throws JS error when filter exists but doesn't have opacity in it
+	test("css(String, Object) for MSIE", function() {
+		// for #1438, IE throws JS error when filter exists but doesn't have opacity in it
 		jQuery('#foo').css("filter", "progid:DXImageTransform.Microsoft.Chroma(color='red');");
-  	equals( jQuery('#foo').css('opacity'), '1', "Assert opacity is 1 when a different filter is set in IE, #1438" );
-
-    var filterVal = "progid:DXImageTransform.Microsoft.Alpha(opacity=30) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
-    var filterVal2 = "progid:DXImageTransform.Microsoft.alpha(opacity=100) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
-    var filterVal3 = "progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
-    jQuery('#foo').css("filter", filterVal);
-    equals( jQuery('#foo').css("filter"), filterVal, "css('filter', val) works" );
-    jQuery('#foo').css("opacity", 1);
-    equals( jQuery('#foo').css("filter"), filterVal2, "Setting opacity in IE doesn't duplicate opacity filter" );
-    equals( jQuery('#foo').css("opacity"), 1, "Setting opacity in IE with other filters works" );
-    jQuery('#foo').css("filter", filterVal3).css("opacity", 1);
-    ok( jQuery('#foo').css("filter").indexOf(filterVal3) !== -1, "Setting opacity in IE doesn't clobber other filters" );
-  });
+		equals( jQuery('#foo').css('opacity'), '1', "Assert opacity is 1 when a different filter is set in IE, #1438" );
+
+		var filterVal = "progid:DXImageTransform.Microsoft.Alpha(opacity=30) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
+		var filterVal2 = "progid:DXImageTransform.Microsoft.alpha(opacity=100) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
+		var filterVal3 = "progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
+		jQuery('#foo').css("filter", filterVal);
+		equals( jQuery('#foo').css("filter"), filterVal, "css('filter', val) works" );
+		jQuery('#foo').css("opacity", 1);
+		equals( jQuery('#foo').css("filter"), filterVal2, "Setting opacity in IE doesn't duplicate opacity filter" );
+		equals( jQuery('#foo').css("opacity"), 1, "Setting opacity in IE with other filters works" );
+		jQuery('#foo').css("filter", filterVal3).css("opacity", 1);
+		ok( jQuery('#foo').css("filter").indexOf(filterVal3) !== -1, "Setting opacity in IE doesn't clobber other filters" );
+	});
 }
 
 test("css(String, Function)", function() {
 	expect(3);
-		
+	
 	var sizes = ["10px", "20px", "30px"];
 	
 	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
@@ -191,7 +191,7 @@ test("css(String, Function)", function() {
 		index++;
 		return size;
 	});
-		
+	
 	index = 0;
 	
 	jQuery("#cssFunctionTest div").each(function() {
@@ -206,7 +206,7 @@ test("css(String, Function)", function() {
 
 test("css(String, Function) with incoming value", function() {
 	expect(3);
-		
+	
 	var sizes = ["10px", "20px", "30px"];
 	
 	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
@@ -221,7 +221,7 @@ test("css(String, Function) with incoming value", function() {
 		index++;
 		return size;
 	});
-		
+	
 	index = 0;
 	
 	jQuery("#cssFunctionTest div").css("font-size", function(i, computedSize) {
@@ -236,7 +236,7 @@ test("css(String, Function) with incoming value", function() {
 
 test("css(Object) where values are Functions", function() {
 	expect(3);
-		
+	
 	var sizes = ["10px", "20px", "30px"];
 	
 	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
@@ -251,22 +251,22 @@ test("css(Object) where values are Functions", function() {
 		index++;
 		return size;
 	}});
-		
+	
 	index = 0;
-		
+	
 	jQuery("#cssFunctionTest div").each(function() {
 		var computedSize = jQuery(this).css("font-size")
 		var expectedSize = sizes[index]
 		equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
 		index++;
 	});
-		
+	
 	jQuery("#cssFunctionTest").remove();
 });
 
 test("css(Object) where values are Functions with incoming values", function() {
 	expect(3);
-		
+	
 	var sizes = ["10px", "20px", "30px"];
 	
 	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
@@ -281,16 +281,16 @@ test("css(Object) where values are Functions with incoming values", function() {
 		index++;
 		return size;
 	}});
-		
+	
 	index = 0;
-		
+	
 	jQuery("#cssFunctionTest div").css({"font-size": function(i, computedSize) {
 		var expectedSize = sizes[index]
 		equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
 		index++;
 		return computedSize;
 	}});
-		
+	
 	jQuery("#cssFunctionTest").remove();
 });