Refactor fn.val() implementation

LEV7n · Jul 12, 2016 · f5500eb · f5500eb
1 parent aba24c7
commit f5500eb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/zepto.js b/src/zepto.js
@@ -655,15 +655,16 @@ var Zepto = (function() {
       return data !== null ? deserializeValue(data) : undefined
     },
     val: function(value){
-      if (value == null) value = ""
-      return 0 in arguments ?
-        this.each(function(idx){
+      if (0 in arguments) {
+        if (value == null) value = ""
+        return this.each(function(idx){
           this.value = funcArg(this, value, idx, this.value)
-        }) :
-        (this[0] && (this[0].multiple ?
+        })
+      } else {
+        return this[0] && (this[0].multiple ?
            $(this[0]).find('option').filter(function(){ return this.selected }).pluck('value') :
            this[0].value)
-        )
+      }
     },
     offset: function(coordinates){
       if (coordinates) return this.each(function(index){

diff --git a/test/zepto.html b/test/zepto.html
@@ -1978,7 +1978,10 @@ <h1>Zepto Core unit tests</h1>
 
         t.assertEqual('Hello World', input.val())
 
-        input.val(undefined);
+        input.val(undefined)
+        t.assertEqual('', input.val())
+
+        input.val(null)
         t.assertEqual('', input.val())
 
         input.val('')