Landing pull request 382. Adds support for number values (meter,progress); Fixes #9319.

More Details:
 - https://github.com/jquery/jquery/pull/382
 - http://bugs.jquery.com/ticket/9319
1.7/enhancement_8685
rwldrn 2011-05-20 11:03:33 -04:00 committed by timmywil
parent a1545b5079
commit f82b9dddc4
2 changed files with 31 additions and 1 deletions

View File

@ -165,7 +165,13 @@ jQuery.fn.extend({
return ret;
}
return (elem.value || "").replace(rreturn, "");
ret = elem.value;
return typeof ret === "string" ?
// handle most common string cases
ret.replace(rreturn, "") :
// handle cases where value is null/undef or number
ret == null ? "" : ret;
}
return undefined;

View File

@ -611,6 +611,30 @@ test("val()", function() {
equals( jQuery("<option/>").val("test").attr("value"), "test", "Setting value sets the value attribute" );
});
if ( "value" in document.createElement("meter") &&
"value" in document.createElement("progress") ) {
test("val() respects numbers without exception (Bug #9319)", function() {
expect(4);
var $meter = jQuery("<meter min='0' max='10' value='5.6'></meter>"),
$progress = jQuery("<progress max='10' value='1.5'></progress>");
try {
equal( typeof $meter.val(), "number", "meter, returns a number and does not throw exception" );
equal( $meter.val(), $meter[0].value, "meter, api matches host and does not throw exception" );
equal( typeof $progress.val(), "number", "progress, returns a number and does not throw exception" );
equal( $progress.val(), $progress[0].value, "progress, api matches host and does not throw exception" );
} catch(e) {}
$meter.remove();
$progress.remove();
});
}
var testVal = function(valueObj) {
expect(8);