fix val() for select multiple; fixes madrobby#501

HPZhang · May 2, 2012 · 9d6515c · 9d6515c
1 parent 7cf9c7a
commit 9d6515c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/zepto.js b/src/zepto.js
@@ -448,7 +448,9 @@ var Zepto = (function() {
     },
     val: function(value){
       return (value === undefined) ?
-        (this.length > 0 ? (this[0].multiple ? $(this[0]).find('option[selected]').pluck('value') :  this[0].value) : undefined) :
+        (this.length > 0 ?
+          (this[0].multiple ? $(this[0]).find('option').not(function(o){ return !this.selected }).pluck('value') : this[0].value) :
+          undefined) :
         this.each(function(idx){
           this.value = funcArg(this, value, idx, this.value)
         })

diff --git a/test/zepto.html b/test/zepto.html
@@ -1337,8 +1337,10 @@ <h1>Zepto DOM unit tests</h1>
 
         var multiple =
           $('<select multiple><option selected>1</option><option value=2 selected="selected">a</option><option>3</option></select>')
+        t.assertEqualCollection(['1','2'], multiple.val())
 
-        t.assertEqualCollection([1,2], multiple.val())
+        multiple.find('option')[0].selected = false
+        t.assertEqualCollection(['2'], multiple.val())
       },
 
       testChaining: function(t){