fix: undefined escape at #836 #843
Conversation
| @@ -119,6 +119,7 @@ var filters = { | |||
| if(str instanceof r.SafeString) { | |||
| return str; | |||
| } | |||
| if (str == null) str = ''; | |||
There was a problem hiding this comment.
Instead of this, please use https://github.com/atian25/nunjucks/blob/d75a9993c79fb513e9e651bc938f5555213cb2a7/src/filters.js#L6
There was a problem hiding this comment.
if(value === null || value === undefined || value === false) {
render('{{ foo }}', { foo: false }) should render false or empty string ?
|
@atian25 should fix |
| @@ -1395,6 +1395,10 @@ | |||
| expect(res).to.be('&><\'"'); | |||
| }); | |||
|
|
|||
| render('{{ foo }}', { foo: null }, { autoescape: true }, function (err, res) { | |||
| expect(res).to.be(''); | |||
| }); | |||
There was a problem hiding this comment.
add render('{{ foo | safe }}', { foo: '<html>' }, { autoescape: true } test for safe filter.
|
@vecmezoni updated. question:
|
|
boolean value should follow |
|
@fengmk2 agree. updated. |
| @@ -119,10 +119,12 @@ var filters = { | |||
| if(str instanceof r.SafeString) { | |||
| return str; | |||
| } | |||
| str = (str === null || str === undefined) ? '' : str; | |||
There was a problem hiding this comment.
Could you please fix normalize function and remove false from there and use normalize here.
I don't see any idea behind it
There was a problem hiding this comment.
maybe another PR. This one is focus at quick bug fix.
I'm afraid it(change normalize) will cause BREAK CHANGE.
There was a problem hiding this comment.
ok, i'll merge it to 2.x, please prepare pull request for master
There was a problem hiding this comment.
could you rebase this branch on 2.x?
There was a problem hiding this comment.
@vecmezoni plz review again. The ci is fail, but local test is ok, could you trigger it again?
There was a problem hiding this comment.
I can't trigger CI, you can change commit hash and push it with force. It would trigger Appveyour
There was a problem hiding this comment.
@vecmezoni done, travis is pass.
|
Merged. Waiting for |
|
2.5.1 released, cherry-picked this patch to master. |
| return r.markSafe(lib.escape(str.toString())); | ||
| }, | ||
|
|
||
| safe: function(str) { | ||
| str = (str === null || str === undefined) ? '' : str; |
There was a problem hiding this comment.
relate #843
https://github.com/mozilla/nunjucks/pull/836/files#r78286483