Merge pull request #1951 from /issues/1950@v3

button: Don't render element for text if passed `null` or `undefined`
bem · Oct 25, 2016 · baf20aa · baf20aa
2 parents 60f35ca + 010eb06
commit baf20aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/common.blocks/button/button.bemhtml.js b/common.blocks/button/button.bemhtml.js
@@ -52,7 +52,8 @@ block('button')(
             var ctx = this.ctx,
                 content = [ctx.icon];
             // NOTE: wasn't moved to separate template for optimization
-            'text' in ctx && content.push({ elem : 'text', content : ctx.text });
+            /* jshint eqnull: true */
+            ctx.text != null && content.push({ elem : 'text', content : ctx.text });
             return content;
         },
         match(function() { return typeof this.ctx.content !== 'undefined'; })(function() {

diff --git a/common.blocks/button/button.bh.js b/common.blocks/button/button.bh.js
@@ -27,7 +27,8 @@ module.exports = function(bh) {
         var content = ctx.content();
         if(typeof content === 'undefined') {
             content = [json.icon];
-            'text' in json && content.push({ elem : 'text', content : json.text });
+            /* jshint eqnull: true */
+            json.text != null && content.push({ elem : 'text', content : json.text });
             ctx.content(content);
         }
     });