Merge branch 'master' of github.com:jquery/jquery

This commit is contained in:
jeresig 2010-09-24 18:02:39 -04:00
commit 83b261c976
2 changed files with 12 additions and 5 deletions

View file

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