Merge pull request #702 from drzraf/raw-filter-empty-string

RobLoach · web-flow · commit 326c59e5d606 · 2019-12-31T06:23:10.000-05:00
raw filter on the empty string
diff --git a/src/twig.core.js b/src/twig.core.js
@@ -1443,7 +1443,7 @@ module.exports = function (Twig) {
      */
 
     Twig.Markup = function (content, strategy) {
-        if (typeof content !== 'string' || content.length === 0) {
+        if (typeof content !== 'string') {
             return content;
         }
 
diff --git a/src/twig.filters.js b/src/twig.filters.js
@@ -745,7 +745,7 @@ module.exports = function (Twig) {
             return value[value.length - 1];
         },
         raw(value) {
-            return new Twig.Markup(value);
+            return new Twig.Markup(value || '');
         },
         batch(items, params) {
             let size = params.shift();
diff --git a/test/test.filters.js b/test/test.filters.js
@@ -778,6 +778,13 @@ describe('Twig.js Filters ->', function () {
                 value: '<test>&</test>'
             }).should.equal('<test>&</test>');
         });
+
+        it('should output an empty string', function () {
+            const template = twig({data: '{{ value|raw }}'});
+            template.render({value: ''}).should.equal('');
+            template.render({}).should.equal('');
+        });
+
     });
 
     describe('round ->', function () {

Original file line number	Diff line number	Diff line change
`@@ -1443,7 +1443,7 @@ module.exports = function (Twig) {`
`1443`	`1443`	`*/`
`1444`	`1444`
`1445`	`1445`	`Twig.Markup = function (content, strategy) {`
`1446`		`- if (typeof content !== 'string' \|\| content.length === 0) {`
	`1446`	`+ if (typeof content !== 'string') {`
`1447`	`1447`	`return content;`
`1448`	`1448`	`}`
`1449`	`1449`