Skip to content

Commit 9d1bfeb

Browse files
committed
Make sure that accessing computed CSS for elements returns 'auto' instead of '' consistently. Fixes #7337.
1 parent e377621 commit 9d1bfeb

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/css.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,12 +173,13 @@ jQuery.each(["height", "width"], function( i, name ) {
173173
val = curCSS( elem, name, name );
174174

175175
if ( val != null ) {
176-
return val === "auto" ? "" : val;
176+
return val;
177177
}
178178
}
179179

180180
if ( val < 0 || val == null ) {
181-
return elem.style[ name ];
181+
val = elem.style[ name ];
182+
return val === "" ? "auto" : val;
182183
}
183184

184185
return typeof val === "string" ? val : val + "px";
@@ -247,7 +248,7 @@ if ( getComputedStyle ) {
247248
}
248249
}
249250

250-
return ret;
251+
return ret === "" ? "auto" : ret;
251252
};
252253

253254
} else if ( document.documentElement.currentStyle ) {
@@ -274,7 +275,7 @@ if ( getComputedStyle ) {
274275
elem.runtimeStyle.left = rsLeft;
275276
}
276277

277-
return ret;
278+
return ret === "" ? "auto" : ret;
278279
};
279280
}
280281

test/unit/css.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ test("css(String|Hash)", function() {
1313

1414
var div = jQuery( "<div>" );
1515

16-
equals( div.css("width"), "", "Width on disconnected node." );
17-
equals( div.css("height"), "", "Height on disconnected node." );
16+
equals( div.css("width"), "auto", "Width on disconnected node." );
17+
equals( div.css("height"), "auto", "Height on disconnected node." );
1818

1919
div.css({ width: 4, height: 4 });
2020

0 commit comments

Comments
 (0)