Do not quote simple attr value with singleQuotesForDataAttrs option

bem · Jul 9, 2019 · b887017 · b887017
1 parent fc4b4ed
commit b887017
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/lib/bemhtml/index.js b/lib/bemhtml/index.js
@@ -174,19 +174,19 @@ BEMHTML.prototype.renderAttrs = function(attrs) {
         var attrVal = utils.isSimple(attr) ? attr : this.run(attr);
         out += ' ' + name + '=';
         out += (this._singleQuotesForDataAttrs && name.indexOf('data-') === 0) ?
-          '\'' + utils.jsAttrEscape(attrVal) + '\'' :
-          this.getAttrValue(attrVal);
+          this.getAttrValue(attrVal, utils.jsAttrEscape(attrVal), '\'') :
+          this.getAttrValue(attrVal, utils.attrEscape(attrVal), '"');
       }
     }
   }
 
   return out;
 };
 
-BEMHTML.prototype.getAttrValue = function(attrVal) {
+BEMHTML.prototype.getAttrValue = function(attrVal, escapedAttrVal, quote) {
   return this._unquotedAttrs && utils.isUnquotedAttr(attrVal) ?
     attrVal :
-    ('"' + utils.attrEscape(attrVal) + '"');
+    (quote + escapedAttrVal + quote);
 };
 
 BEMHTML.prototype.renderMix = function(entity, mix, jsParams, addJSInitClass) {

diff --git a/test/bemhtml-test.js b/test/bemhtml-test.js
@@ -229,11 +229,27 @@ describe('BEMHTML engine tests', function() {
       test(function() {},
         { block: 'b', attrs: {
           id: 'without-changes',
-          'data-test': '{"reqid":"42"}'
+          'data-test': '{"reqid":"42"}',
+          'data-simple': '1234'
         } },
         '<div class="b" id="without-changes" ' +
-        'data-test=\'{"reqid":"42"}\'></div>',
+        'data-test=\'{"reqid":"42"}\' ' +
+        'data-simple=\'1234\'></div>',
         { singleQuotesForDataAttrs: true });
     });
+
+    it('should render simple data-attr value without quotes if option true',
+    function() {
+      test(function() {},
+        { block: 'b', attrs: {
+          id: 'without-changes',
+          'data-test': '{"reqid":"42"}',
+          'data-simple': '1234'
+        } },
+        '<div class=b id=without-changes ' +
+        'data-test=\'{"reqid":"42"}\' ' +
+        'data-simple=1234></div>',
+        { singleQuotesForDataAttrs: true, unquotedAttrs: true });
+    });
   });
 });