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

Maintain returning 0px from width/height for disconnected nodes for backwards compat, for now. Fixes #7395.

Browse source
This commit is contained in:
jeresig 2010-11-09 23:29:26 -05:00
parent 795e880bba
commit 3394d32ea7
3 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/css.js
View file

@ -177,13 +177,18 @@ jQuery.each(["height", "width"], function( i, name ) {
} }
if ( val != null ) { if ( val != null ) {
return val === "" ? "auto" : val; // Should return "auto" instead of 0, use 0 for
// temporary backwards-compat
return val === "" ? "0px" : val;
} }
} }
if ( val < 0 || val == null ) { if ( val < 0 || val == null ) {
val = elem.style[ name ]; val = elem.style[ name ];
return val === "" ? "auto" : val;
// Should return "auto" instead of 0, use 0 for
// temporary backwards-compat
return val === "" ? "0px" : val;
} }
return typeof val === "string" ? val : val + "px"; return typeof val === "string" ? val : val + "px";

6
test/unit/css.js
View file

@ -13,8 +13,10 @@ test("css(String|Hash)", function() {
var div = jQuery( "<div>" ); var div = jQuery( "<div>" );
equals( div.css("width"), "auto", "Width on disconnected node." ); // These should be "auto" (or some better value)
equals( div.css("height"), "auto", "Height on disconnected node." ); // temporarily provide "0px" for backwards compat
equals( div.css("width"), "0px", "Width on disconnected node." );
equals( div.css("height"), "0px", "Height on disconnected node." );
div.css({ width: 4, height: 4 }); div.css({ width: 4, height: 4 });

28
test/unit/dimensions.js
View file

@ -103,7 +103,7 @@ test("height() with function args", function() {
}); });
test("innerWidth()", function() { test("innerWidth()", function() {
expect(3); expect(4);
var $div = jQuery("#nothiddendiv"); var $div = jQuery("#nothiddendiv");
// set styles // set styles
@ -121,10 +121,15 @@ test("innerWidth()", function() {
// reset styles // reset styles
$div.css({ display: "", border: "", padding: "", width: "", height: "" }); $div.css({ display: "", border: "", padding: "", width: "", height: "" });
var div = jQuery( "<div>" );
// Temporarily require 0 for backwards compat - should be auto
equals( div.innerWidth(), 0, "Make sure that disconnected nodes are handled." );
}); });
test("innerHeight()", function() { test("innerHeight()", function() {
expect(3); expect(4);
var $div = jQuery("#nothiddendiv"); var $div = jQuery("#nothiddendiv");
// set styles // set styles
@ -142,10 +147,15 @@ test("innerHeight()", function() {
// reset styles // reset styles
$div.css({ display: "", border: "", padding: "", width: "", height: "" }); $div.css({ display: "", border: "", padding: "", width: "", height: "" });
var div = jQuery( "<div>" );
// Temporarily require 0 for backwards compat - should be auto
equals( div.innerHeight(), 0, "Make sure that disconnected nodes are handled." );
}); });
test("outerWidth()", function() { test("outerWidth()", function() {
expect(6); expect(7);
var $div = jQuery("#nothiddendiv"); var $div = jQuery("#nothiddendiv");
$div.css("width", 30); $div.css("width", 30);
@ -164,10 +174,15 @@ test("outerWidth()", function() {
// reset styles // reset styles
$div.css({ position: "", display: "", border: "", padding: "", width: "", height: "" }); $div.css({ position: "", display: "", border: "", padding: "", width: "", height: "" });
var div = jQuery( "<div>" );
// Temporarily require 0 for backwards compat - should be auto
equals( div.outerWidth(), 0, "Make sure that disconnected nodes are handled." );
}); });
test("outerHeight()", function() { test("outerHeight()", function() {
expect(6); expect(7);
var $div = jQuery("#nothiddendiv"); var $div = jQuery("#nothiddendiv");
$div.css("height", 30); $div.css("height", 30);
@ -185,4 +200,9 @@ test("outerHeight()", function() {
// reset styles // reset styles
$div.css({ display: "", border: "", padding: "", width: "", height: "" }); $div.css({ display: "", border: "", padding: "", width: "", height: "" });
var div = jQuery( "<div>" );
// Temporarily require 0 for backwards compat - should be auto
equals( div.outerHeight(), 0, "Make sure that disconnected nodes are handled." );
}); });