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:
jeresig 2010-09-24 18:02:39 -04:00
parent adff8e45e2 0636dffc24
commit 83b261c976
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/attributes.js
View file

@ -136,7 +136,7 @@ jQuery.fn.extend({
}, },
val: function( value ) { val: function( value ) {
if ( value === undefined ) { if ( !arguments.length ) {
var elem = this[0]; var elem = this[0];
if ( elem ) { if ( elem ) {
@ -209,9 +209,10 @@ jQuery.fn.extend({
val = value.call(this, i, self.val()); val = value.call(this, i, self.val());
} }
// Typecast each time if the value is a Function and the appended // Treat null/undefined as ""; convert numbers to string
// value is therefore different each time. if ( val == null ) {
if ( typeof val === "number" ) { val = "";
} else if ( typeof val === "number" ) {
val += ""; val += "";
} }

8
test/unit/attributes.js
View file

@ -359,14 +359,20 @@ test("val()", function() {
}); });
var testVal = function(valueObj) { var testVal = function(valueObj) {
expect(6); expect(8);
jQuery("#text1").val(valueObj( 'test' )); jQuery("#text1").val(valueObj( 'test' ));
equals( document.getElementById('text1').value, "test", "Check for modified (via val(String)) value of input element" ); equals( document.getElementById('text1').value, "test", "Check for modified (via val(String)) value of input element" );
jQuery("#text1").val(valueObj( undefined ));
equals( document.getElementById('text1').value, "", "Check for modified (via val(undefined)) value of input element" );
jQuery("#text1").val(valueObj( 67 )); jQuery("#text1").val(valueObj( 67 ));
equals( document.getElementById('text1').value, "67", "Check for modified (via val(Number)) value of input element" ); equals( document.getElementById('text1').value, "67", "Check for modified (via val(Number)) value of input element" );
jQuery("#text1").val(valueObj( null ));
equals( document.getElementById('text1').value, "", "Check for modified (via val(null)) value of input element" );
jQuery("#select1").val(valueObj( "3" )); jQuery("#select1").val(valueObj( "3" ));
equals( jQuery("#select1").val(), "3", "Check for modified (via val(String)) value of select element" ); equals( jQuery("#select1").val(), "3", "Check for modified (via val(String)) value of select element" );