Make text(value) assign empty string for null/undefined

Previously it would assign a literal string `"null"` for null, which wasn't very useful.
evekcin · Jun 16, 2014 · ed0eb87 · ed0eb87
1 parent 0ecb356
commit ed0eb87
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/zepto.js b/src/zepto.js
@@ -597,7 +597,7 @@ var Zepto = (function() {
         (this.length > 0 ? this[0].textContent : null) :
         this.each(function(idx){
           var newText = funcArg(this, text, idx, this.textContent)
-          this.textContent = newText === undefined ? '' : ''+newText
+          this.textContent = newText == null ? '' : ''+newText
         })
     },
     attr: function(name, value){

diff --git a/test/zepto.html b/test/zepto.html
@@ -1631,7 +1631,8 @@ <h1>Zepto Core unit tests</h1>
         t.assertEqual('',         $('<h1/>').text())
         t.assertEqual('',         $('<h1/>').text('').text())
         t.assertEqual('',         $('<h1/>').text(undefined).text())
-        t.assertEqual('null',     $('<h1/>').text(null).text())
+        t.assertEqual('',         $('<h1/>').text(null).text())
+        t.assertEqual('false',    $('<h1/>').text(false).text())
         t.assertEqual('1',        $('<h1/>').text(1).text())
         t.assertEqual('<b>a</b>', $('<h1/>').text('<b>a</b>').text())
 
@@ -1666,6 +1667,7 @@ <h1>Zepto Core unit tests</h1>
         t.assertEqual('HELLO 0', els[0].textContent)
         t.assertEqual('', els[1].textContent)
         t.assertEqual('WORLD 2', els[2].textContent)
+        t.assertEqual('', els[3].textContent)
       },
 
       testEmpty: function(t) {