X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcss.js;h=02a7b084c937ab16d1c64e1797eded2a57999777;hb=0cdcef5b364fa3c89d7f27935e77b453f4a56efd;hp=270638e62f2ec00fc1790ca5076dd3a30718b680;hpb=64e4a879f9f92053ac4d58a3fffc0bbff6900b6e;p=jquery.git

diff --git a/test/unit/css.js b/test/unit/css.js
index 270638e..02a7b08 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1,9 +1,9 @@
 module("css");
 
 test("css(String|Hash)", function() {
-	expect(27);
+	expect(29);
 
-	equals( jQuery('#main').css("display"), 'none', 'Check for css property "display"');
+	equals( jQuery('#main').css("display"), 'block', 'Check for css property "display"');
 
 	ok( jQuery('#nothiddendiv').is(':visible'), 'Modifying CSS display: Assert element is visible');
 	jQuery('#nothiddendiv').css({display: 'none'});
@@ -12,15 +12,13 @@ test("css(String|Hash)", function() {
 	ok( jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is visible');
 
 	// handle negative numbers by ignoring #1599, #4216
+	jQuery('#nothiddendiv').css({ 'width': 1, 'height': 1 });
+
 	var width = parseFloat(jQuery('#nothiddendiv').css('width')), height = parseFloat(jQuery('#nothiddendiv').css('height'));
 	jQuery('#nothiddendiv').css({ width: -1, height: -1 });
 	equals( parseFloat(jQuery('#nothiddendiv').css('width')), width, 'Test negative width ignored')
 	equals( parseFloat(jQuery('#nothiddendiv').css('height')), height, 'Test negative height ignored')
 
-	jQuery('#floatTest').css({styleFloat: 'right'});
-	equals( jQuery('#floatTest').css('styleFloat'), 'right', 'Modified CSS float using "styleFloat": Assert float is right');
-	jQuery('#floatTest').css({cssFloat: 'left'});
-	equals( jQuery('#floatTest').css('cssFloat'), 'left', 'Modified CSS float using "cssFloat": Assert float is left');
 	jQuery('#floatTest').css({'float': 'right'});
 	equals( jQuery('#floatTest').css('float'), 'right', 'Modified CSS float using "float": Assert float is right');
 	jQuery('#floatTest').css({'font-size': '30px'});
@@ -42,27 +40,41 @@ test("css(String|Hash)", function() {
 	var div = jQuery('#nothiddendiv'), child = jQuery('#nothiddendivchild');
 
 	equals( parseInt(div.css("fontSize")), 16, "Verify fontSize px set." );
+	equals( parseInt(div.css("font-size")), 16, "Verify fontSize px set." );
 	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." );
 
+	// Have to verify this as the result depends upon the browser's CSS
+	// support for font-size percentages
 	child.attr("class", "prct");
-	equals( parseInt(child.css("fontSize")), 24, "Verify fontSize % set." );
+	var prctval = parseInt(child.css("fontSize")), checkval = 0;
+	if ( prctval === 16 || prctval === 24 ) {
+		checkval = prctval;
+	}
+
+	equals( prctval, checkval, "Verify fontSize % set." );
+
+	equals( typeof child.css("width"), "string", "Make sure that a string width is returned from css('width')." );
 });
 
 test("css(String, Object)", function() {
-	expect(20);
+	expect(21);
+
 	ok( jQuery('#nothiddendiv').is(':visible'), 'Modifying CSS display: Assert element is visible');
 	jQuery('#nothiddendiv').css("display", 'none');
 	ok( !jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is hidden');
 	jQuery('#nothiddendiv').css("display", 'block');
 	ok( jQuery('#nothiddendiv').is(':visible'), 'Modified CSS display: Assert element is visible');
 
-	jQuery('#floatTest').css('styleFloat', 'left');
-	equals( jQuery('#floatTest').css('styleFloat'), 'left', 'Modified CSS float using "styleFloat": Assert float is left');
-	jQuery('#floatTest').css('cssFloat', 'right');
-	equals( jQuery('#floatTest').css('cssFloat'), 'right', 'Modified CSS float using "cssFloat": Assert float is right');
+	jQuery("#nothiddendiv").css("top", "-1em");
+	ok( jQuery("#nothiddendiv").css("top"), -16, "Check negative number in EMs." );
+
 	jQuery('#floatTest').css('float', 'left');
 	equals( jQuery('#floatTest').css('float'), 'left', 'Modified CSS float using "float": Assert float is left');
 	jQuery('#floatTest').css('font-size', '20px');
@@ -85,6 +97,13 @@ test("css(String, Object)", function() {
 	// opera sometimes doesn't update 'display' correctly, see #2037
 	jQuery("#t2037")[0].innerHTML = jQuery("#t2037")[0].innerHTML
 	equals( jQuery("#t2037 .hidden").css("display"), "none", "Make sure browser thinks it is hidden" );
+
+	var div = jQuery("#nothiddendiv"),
+		display = div.css("display"),
+		ret = div.css("display", undefined);
+
+	equals( ret, div, "Make sure setting undefined returns the original set." );
+	equals( div.css("display"), display, "Make sure that the display wasn't changed." );
 });
 
 if(jQuery.browser.msie) {
@@ -93,80 +112,137 @@ if(jQuery.browser.msie) {
 		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 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 clobber other filters" );
-    equals( jQuery('#foo').css("opacity"), 1, "Setting opacity in IE with other filters 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() {
-	try { 
-		expect(3);
+	expect(3);
 		
-		var sizes = ["10px", "20px", "30px"];
+	var sizes = ["10px", "20px", "30px"];
 	
-		jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
-					 "<div class='cssFunction'></div>" + 
-					 "<div class='cssFunction'></div></div>")
-			.appendTo("body");
+	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
+				 "<div class='cssFunction'></div>" + 
+				 "<div class='cssFunction'></div></div>")
+		.appendTo("body");
 	
-		var index = 0;
+	var index = 0;
 	
-		jQuery("#cssFunctionTest div").css("font-size", function() {
-			var size = sizes[index];
-			index++;
-			return size;
-		});
+	jQuery("#cssFunctionTest div").css("font-size", function() {
+		var size = sizes[index];
+		index++;
+		return size;
+	});
 		
-		index = 0;
+	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(String, Function) with incoming value", function() {
+	expect(3);
 		
-		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++;
-		});
+	var sizes = ["10px", "20px", "30px"];
+	
+	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
+				 "<div class='cssFunction'></div>" + 
+				 "<div class='cssFunction'></div></div>")
+		.appendTo("body");
+	
+	var index = 0;
+	
+	jQuery("#cssFunctionTest div").css("font-size", function() {
+		var size = sizes[index];
+		index++;
+		return size;
+	});
 		
-	} finally {
-		jQuery("#cssFunctionTest").remove();
-	}
+	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();
 });
 
 test("css(Object) where values are Functions", function() {
-	try { 
-		expect(3);
+	expect(3);
 		
-		var sizes = ["10px", "20px", "30px"];
+	var sizes = ["10px", "20px", "30px"];
 	
-		jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
-					 "<div class='cssFunction'></div>" + 
-					 "<div class='cssFunction'></div></div>")
-			.appendTo("body");
+	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
+				 "<div class='cssFunction'></div>" + 
+				 "<div class='cssFunction'></div></div>")
+		.appendTo("body");
+
+	var index = 0;
 	
-		var index = 0;
+	jQuery("#cssFunctionTest div").css({fontSize: function() {
+		var size = sizes[index];
+		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("#cssFunctionTest div").css({fontSize: function() {
-			var size = sizes[index];
-			index++;
-			return size;
-		}});
+	jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" + 
+				 "<div class='cssFunction'></div>" + 
+				 "<div class='cssFunction'></div></div>")
+		.appendTo("body");
+
+	var index = 0;
+	
+	jQuery("#cssFunctionTest div").css({fontSize: function() {
+		var size = sizes[index];
+		index++;
+		return size;
+	}});
 		
-		index = 0;
+	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 div").css({"font-size": function(i, computedSize) {
+		var expectedSize = sizes[index]
+		equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
+		index++;
+		return computedSize;
+	}});
 		
-	} finally {
-		jQuery("#cssFunctionTest").remove();
-	}
+	jQuery("#cssFunctionTest").remove();
 });
 
 test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", function () {
@@ -180,3 +256,16 @@ test("jQuery.css(elem, 'height') doesn't clear radio buttons (bug #1095)", funct
 	ok( !! jQuery(":checkbox:first", $checkedtest).attr("checked"), "Check first checkbox still checked." );
 	ok( ! jQuery(":checkbox:last", $checkedtest).attr("checked"), "Check last checkbox still NOT checked." );
 });
+
+test(":visible selector works properly on table elements (bug #4512)", function () {
+	expect(1);
+
+	jQuery('#table').html('<tr><td style="display:none">cell</td><td>cell</td></tr>');
+	equals(jQuery('#table td:visible').length, 1, "hidden cell is not perceived as visible");
+});
+
+test(":visible selector works properly on children with a hidden parent (bug #4512)", function () {
+	expect(1);
+	jQuery('#table').css('display', 'none').html('<tr><td>cell</td><td>cell</td></tr>');
+	equals(jQuery('#table td:visible').length, 0, "hidden cell children not perceived as visible");
+});
\ No newline at end of file