BEMXJST: work with empty string in html field

bem · Jul 29, 2016 · bc28643 · bc28643
1 parent 5bd2476
commit bc28643
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/lib/bemxjst/index.js b/lib/bemxjst/index.js
@@ -275,7 +275,6 @@ BEMXJST.prototype._run = function _run(context) {
   else if (Array.isArray(context))
     res = this.runMany(context);
   else if (
-    context.html &&
     typeof context.html === 'string' &&
     !context.tag &&
     typeof context.block === 'undefined' &&
@@ -329,6 +328,7 @@ BEMXJST.prototype.runSimple = function runSimple(simple) {
       utils.xmlEscape(simple) :
       simple;
   }
+
   return res;
 };
 

diff --git a/lib/bemxjst/utils.js b/lib/bemxjst/utils.js
@@ -49,7 +49,7 @@ exports.isSimple = function isSimple(obj) {
       !obj.attrs &&
       obj.hasOwnProperty('html') &&
       isSimple(obj.html))
-  return true;
+    return true;
   return typeof obj === 'string' || typeof obj === 'number';
 };
 

diff --git a/test/runtime-escaping-test.js b/test/runtime-escaping-test.js
@@ -39,6 +39,12 @@ describe('Content escaping', function() {
     '<unescaped>');
   });
 
+  it('should work with empty string in html field', function() {
+    test(function() {},
+      { html: '' },
+      '');
+  });
+
   it('should ignore html field if block/elem/cls/attrs/tag exists', function() {
     test(function() {
     }, { block: 'b', html: '<unescaped>', content: 'safe text' },