mirror of
https://github.com/jquery/jquery.git
synced 2024-11-23 02:54:22 +00:00
Make sure that height/width methods return numbers instead of strings.
This commit is contained in:
parent
c168c30a6a
commit
cb3a9c14f1
@ -8,14 +8,14 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
|
||||
// innerHeight and innerWidth
|
||||
jQuery.fn["inner" + name] = function() {
|
||||
return this[0] ?
|
||||
jQuery.css( this[0], type, undefined, false, "padding" ) :
|
||||
parseFloat( jQuery.css( this[0], type, undefined, false, "padding" ), 10 ) :
|
||||
null;
|
||||
};
|
||||
|
||||
// outerHeight and outerWidth
|
||||
jQuery.fn["outer" + name] = function( margin ) {
|
||||
return this[0] ?
|
||||
jQuery.css( this[0], type, undefined, false, margin ? "margin" : "border" ) :
|
||||
parseFloat( jQuery.css( this[0], type, undefined, false, margin ? "margin" : "border" ), 10 ) :
|
||||
null;
|
||||
};
|
||||
|
||||
@ -50,7 +50,7 @@ jQuery.each([ "Height", "Width" ], function( i, name ) {
|
||||
// Get or set width or height on the element
|
||||
size === undefined ?
|
||||
// Get width or height on the element
|
||||
jQuery.css( elem, type ) :
|
||||
parseFloat( jQuery.css( elem, type ), 10 ) :
|
||||
|
||||
// Set the width or height on the element (default to pixels if value is unitless)
|
||||
this.css( type, typeof size === "string" ? size : size + "px" );
|
||||
|
Loading…
Reference in New Issue
Block a user