Fixed the issue where getting an empty value was impossible. Fixes #5697.

diff --git a/src/attributes.js b/src/attributes.js
index 787c6bbe4178f399cfea88d3059eb41d025b3b86..91a0fe176b7b95e89ddc48fcea5fe2e31bb1e25a 100644 (file)
--- a/src/attributes.js
+++ b/src/attributes.js
@@ -164,7 +164,7 @@ jQuery.fn.extend({
                                var values = jQuery.makeArray(val);
 
                                jQuery( "option", this ).each(function() {
-                                       this.selected = jQuery.inArray( this.value || this.text, values ) >= 0;
+                                       this.selected = jQuery.inArray( this.value, values ) >= 0;
                                });
 
                                if ( !values.length ) {

diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index 03f8f32c8e7666745f1183067f5c779c165a16eb..7521c767f9c0af4fd75f49a69856a11db3bd9f37 100644 (file)
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -619,7 +619,7 @@ test("clone() on XML nodes", function() {
 }
 
 test("val()", function() {
-       expect(9);
+       expect(11);
 
        document.getElementById('text1').value = "bla";
        equals( jQuery("#text1").val(), "bla", "Check for modified value of input element" );
@@ -641,6 +641,11 @@ test("val()", function() {
 
        equals( jQuery('#option3e').val(), 'no value', 'Call val() on a option element with no value attribute' );
 
+       equals( jQuery('#option3a').val(), '', 'Call val() on a option element with no value attribute' );
+
+       jQuery('#select3').val("");
+       same( jQuery('#select3').val(), [''], 'Call val() on a multiple="multiple" select' );
+
 });
 
 var testVal = function(valueObj) {