deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' of github.com:jquery/jquery

Browse source
This commit is contained in:
timmywil 2011-04-22 00:28:11 -04:00
commit bc7bb0df28
2 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/css.js
View file

@ -59,7 +59,9 @@ jQuery.extend({
"fontWeight": true, "fontWeight": true,
"opacity": true, "opacity": true,
"zoom": true, "zoom": true,
"lineHeight": true "lineHeight": true,
"widows": true,
"orphans": true
}, },
// Add in properties whose names you wish to fix before // Add in properties whose names you wish to fix before

26
test/unit/css.js
View file

@ -45,9 +45,9 @@ test("css(String|Hash)", function() {
equals( jQuery("#floatTest").css("float"), "right", "Modified CSS float using \"float\": Assert float is right"); equals( jQuery("#floatTest").css("float"), "right", "Modified CSS float using \"float\": Assert float is right");
jQuery("#floatTest").css({"font-size": "30px"}); jQuery("#floatTest").css({"font-size": "30px"});
equals( jQuery("#floatTest").css("font-size"), "30px", "Modified CSS font-size: Assert font-size is 30px"); equals( jQuery("#floatTest").css("font-size"), "30px", "Modified CSS font-size: Assert font-size is 30px");
jQuery.each("0,0.25,0.5,0.75,1".split(","), function(i, n) { jQuery.each("0,0.25,0.5,0.75,1".split(","), function(i, n) {
jQuery("#foo").css({opacity: n}); jQuery("#foo").css({opacity: n});
equals( jQuery("#foo").css("opacity"), parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" ); equals( jQuery("#foo").css("opacity"), parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a String" );
jQuery("#foo").css({opacity: parseFloat(n)}); jQuery("#foo").css({opacity: parseFloat(n)});
equals( jQuery("#foo").css("opacity"), parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" ); equals( jQuery("#foo").css("opacity"), parseFloat(n), "Assert opacity is " + parseFloat(n) + " as a Number" );
@ -394,3 +394,27 @@ test("jQuery.cssProps behavior, (bug #8402)", function() {
// cleanup jQuery.cssProps // cleanup jQuery.cssProps
jQuery.cssProps.top = undefined; jQuery.cssProps.top = undefined;
}); });
test("widows & orphans #8936", function () {
expect(4);
var $p = jQuery("<p>").appendTo("#main").end();
$p.css({
widows: 0,
orphans: 0
});
equal( $p.css("widows"), 0, "widows correctly start with value 0");
equal( $p.css("orphans"), 0, "orphans correctly start with value 0");
$p.css({
widows: 3,
orphans: 3
});
equal( $p.css("widows"), 3, "widows correctly set to 3");
equal( $p.css("orphans"), 3, "orphans correctly set to 3");
$p.remove();
});