Changeset 5793

Timestamp:

07/23/08 17:00:32 (6 months ago)

Author:

aflesler

Message:

jquery core: closes #2652. val() supports option elements, also simplified the code.

Location:

trunk/jquery

Files:

• src/core.js (modified) (2 diffs)
• test/index.html (modified) (1 diff)
• test/unit/core.js (modified) (2 diffs)
• test/unit/selector.js (modified) (1 diff)

trunk/jquery/src/core.js

@@ -363 +363 @@
                 var elem = this[0];
 
+                if( jQuery.nodeName( elem, 'option' ) )
+                    return (elem.attributes.value || {}).specified ? elem.value : elem.text;
+                
                 // We need to handle select boxes special
                 if ( jQuery.nodeName( elem, "select" ) ) {
@@ -380 +383 @@
                         if ( option.selected ) {
                             // Get the specifc value for the option
-                            value = jQuery.browser.msie && !option.attributes.value.specified ? option.text : option.value;
+                            value = jQuery(option).val();
 
                             // We don't need an array for one selects

trunk/jquery/test/index.html

@@ -87 +87 @@
                 <option id="option3c" selected="selected" value="2">2</option>
                 <option id="option3d" value="3">3</option>
+                <option id="option3e">no value</option>
             </select>
             

trunk/jquery/test/unit/core.js

@@ -1143 +1143 @@
 
 test("val()", function() {
-    expect(3);
+    expect(8);
+
     equals( jQuery("#text1").val(), "Test", "Check for value of input element" );
     // ticket #1714 this caused a JS error in IE
     equals( jQuery("#first").val(), "", "Check a paragraph element to see if it has a value" );
     ok( jQuery([]).val() === undefined, "Check an empty jQuery object will return undefined from val" );
+    
+    equals( jQuery('#select2').val(), '3', 'Call val() on a single="single" select' );
+
+    isSet( jQuery('#select3').val(), ['1', '2'], 'Call val() on a multiple="multiple" select' );
+
+    equals( jQuery('#option3c').val(), '2', 'Call val() on a option element with value' );
+    
+    equals( jQuery('#option3a').val(), '', 'Call val() on a option element with empty value' );
+    
+    equals( jQuery('#option3e').val(), 'no value', 'Call val() on a option element with no value attribute' );
+    
 });
 
@@ -1236 +1248 @@
     isSet( jQuery("p").not(jQuery("#ap, #sndp, .result")).get(), q("firstp", "en", "sap", "first"), "not(jQuery)" );
     equals( jQuery("p").not(document.getElementsByTagName("p")).length, 0, "not(Array-like DOM collection)" );
-    isSet( jQuery("#form option").not("option.emptyopt:contains('Nothing'),[selected],[value='1']").get(), q("option1c", "option1d", "option2c", "option3d" ), "not('complex selector')");
+    isSet( jQuery("#form option").not("option.emptyopt:contains('Nothing'),[selected],[value='1']").get(), q("option1c", "option1d", "option2c", "option3d", "option3e" ), "not('complex selector')");
 
     var selects = jQuery("#form select");

trunk/jquery/test/unit/selector.js

@@ -196 +196 @@
     t( "Element Preceded By", "p ~ div", ["foo","fx-queue","fx-tests", "moretests"] );
     t( "Not", "a.blog:not(.link)", ["mark"] );
-    t( "Not - multiple", "#form option:not(:contains('Nothing'),#option1b,:selected)", ["option1c", "option1d", "option2b", "option2c", "option3d"] );
-    t( "Not - complex", "#form option:not([id^='opt']:gt(0):nth-child(-n+3))", [ "option1a", "option1d", "option2d", "option3d"] );
+    t( "Not - multiple", "#form option:not(:contains('Nothing'),#option1b,:selected)", ["option1c", "option1d", "option2b", "option2c", "option3d", "option3e"] );
+    t( "Not - complex", "#form option:not([id^='opt']:gt(0):nth-child(-n+3))", [ "option1a", "option1d", "option2d", "option3d", "option3e"] );
     t( "Not - recursive", "#form option:not(:not(:selected))[id^='option3']", [ "option3b", "option3c"] );