Fix tab spacing.
This commit is contained in:
parent
6e7a4e73a2
commit
6020b6bb38
|
@ -156,27 +156,27 @@ test("css(String, Object)", function() {
|
||||||
});
|
});
|
||||||
|
|
||||||
if ( !jQuery.support.opacity ) {
|
if ( !jQuery.support.opacity ) {
|
||||||
test("css(String, Object) for MSIE", function() {
|
test("css(String, Object) for MSIE", function() {
|
||||||
// for #1438, IE throws JS error when filter exists but doesn't have opacity in it
|
// 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');");
|
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" );
|
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 filterVal2 = "progid:DXImageTransform.Microsoft.alpha(opacity=100) progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
|
||||||
var filterVal3 = "progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
|
var filterVal3 = "progid:DXImageTransform.Microsoft.Blur(pixelradius=5)";
|
||||||
jQuery('#foo').css("filter", filterVal);
|
jQuery('#foo').css("filter", filterVal);
|
||||||
equals( jQuery('#foo').css("filter"), filterVal, "css('filter', val) works" );
|
equals( jQuery('#foo').css("filter"), filterVal, "css('filter', val) works" );
|
||||||
jQuery('#foo').css("opacity", 1);
|
jQuery('#foo').css("opacity", 1);
|
||||||
equals( jQuery('#foo').css("filter"), filterVal2, "Setting opacity in IE doesn't duplicate opacity filter" );
|
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" );
|
equals( jQuery('#foo').css("opacity"), 1, "Setting opacity in IE with other filters works" );
|
||||||
jQuery('#foo').css("filter", filterVal3).css("opacity", 1);
|
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" );
|
ok( jQuery('#foo').css("filter").indexOf(filterVal3) !== -1, "Setting opacity in IE doesn't clobber other filters" );
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
test("css(String, Function)", function() {
|
test("css(String, Function)", function() {
|
||||||
expect(3);
|
expect(3);
|
||||||
|
|
||||||
var sizes = ["10px", "20px", "30px"];
|
var sizes = ["10px", "20px", "30px"];
|
||||||
|
|
||||||
jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
|
jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
|
||||||
|
@ -191,7 +191,7 @@ test("css(String, Function)", function() {
|
||||||
index++;
|
index++;
|
||||||
return size;
|
return size;
|
||||||
});
|
});
|
||||||
|
|
||||||
index = 0;
|
index = 0;
|
||||||
|
|
||||||
jQuery("#cssFunctionTest div").each(function() {
|
jQuery("#cssFunctionTest div").each(function() {
|
||||||
|
@ -206,7 +206,7 @@ test("css(String, Function)", function() {
|
||||||
|
|
||||||
test("css(String, Function) with incoming value", function() {
|
test("css(String, Function) with incoming value", function() {
|
||||||
expect(3);
|
expect(3);
|
||||||
|
|
||||||
var sizes = ["10px", "20px", "30px"];
|
var sizes = ["10px", "20px", "30px"];
|
||||||
|
|
||||||
jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
|
jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
|
||||||
|
@ -221,7 +221,7 @@ test("css(String, Function) with incoming value", function() {
|
||||||
index++;
|
index++;
|
||||||
return size;
|
return size;
|
||||||
});
|
});
|
||||||
|
|
||||||
index = 0;
|
index = 0;
|
||||||
|
|
||||||
jQuery("#cssFunctionTest div").css("font-size", function(i, computedSize) {
|
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() {
|
test("css(Object) where values are Functions", function() {
|
||||||
expect(3);
|
expect(3);
|
||||||
|
|
||||||
var sizes = ["10px", "20px", "30px"];
|
var sizes = ["10px", "20px", "30px"];
|
||||||
|
|
||||||
jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
|
jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
|
||||||
|
@ -251,22 +251,22 @@ test("css(Object) where values are Functions", function() {
|
||||||
index++;
|
index++;
|
||||||
return size;
|
return size;
|
||||||
}});
|
}});
|
||||||
|
|
||||||
index = 0;
|
index = 0;
|
||||||
|
|
||||||
jQuery("#cssFunctionTest div").each(function() {
|
jQuery("#cssFunctionTest div").each(function() {
|
||||||
var computedSize = jQuery(this).css("font-size")
|
var computedSize = jQuery(this).css("font-size")
|
||||||
var expectedSize = sizes[index]
|
var expectedSize = sizes[index]
|
||||||
equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
|
equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
|
||||||
index++;
|
index++;
|
||||||
});
|
});
|
||||||
|
|
||||||
jQuery("#cssFunctionTest").remove();
|
jQuery("#cssFunctionTest").remove();
|
||||||
});
|
});
|
||||||
|
|
||||||
test("css(Object) where values are Functions with incoming values", function() {
|
test("css(Object) where values are Functions with incoming values", function() {
|
||||||
expect(3);
|
expect(3);
|
||||||
|
|
||||||
var sizes = ["10px", "20px", "30px"];
|
var sizes = ["10px", "20px", "30px"];
|
||||||
|
|
||||||
jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
|
jQuery("<div id='cssFunctionTest'><div class='cssFunction'></div>" +
|
||||||
|
@ -281,16 +281,16 @@ test("css(Object) where values are Functions with incoming values", function() {
|
||||||
index++;
|
index++;
|
||||||
return size;
|
return size;
|
||||||
}});
|
}});
|
||||||
|
|
||||||
index = 0;
|
index = 0;
|
||||||
|
|
||||||
jQuery("#cssFunctionTest div").css({"font-size": function(i, computedSize) {
|
jQuery("#cssFunctionTest div").css({"font-size": function(i, computedSize) {
|
||||||
var expectedSize = sizes[index]
|
var expectedSize = sizes[index]
|
||||||
equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
|
equals( computedSize, expectedSize, "Div #" + index + " should be " + expectedSize );
|
||||||
index++;
|
index++;
|
||||||
return computedSize;
|
return computedSize;
|
||||||
}});
|
}});
|
||||||
|
|
||||||
jQuery("#cssFunctionTest").remove();
|
jQuery("#cssFunctionTest").remove();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue