Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add "forceescape" filter #1090

Merged
merged 1 commit into from
Mar 23, 2018
Merged

Add "forceescape" filter #1090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Changelog
=========

* Add `forceescape` filter. Fixes [#782](https://github.com/mozilla/nunjucks/issues/782)

3.1.2 (Feb 23 2018)
-------------------
Expand Down
4 changes: 4 additions & 0 deletions docs/templating.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,6 +1124,10 @@ This default can be overridden by using the first parameter.
3.5
```

### forceescape

Enforce HTML escaping. This will probably double escape variables.

### groupby

Group a sequence of objects by a common attribute:
Expand Down
7 changes: 7 additions & 0 deletions nunjucks/src/filters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,13 @@ function first(arr) {

exports.first = first;

function forceescape(str) {
str = (str === null || str === undefined) ? '' : str;
return r.markSafe(lib.escape(str.toString()));
}

exports.forceescape = forceescape;

function groupby(arr, attr) {
return lib.groupBy(arr, attr);
}
Expand Down
6 changes: 6 additions & 0 deletions tests/filters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,12 @@
equal('{{ "0" | float }}', '0');
});

it('forceescape', function(done) {
equal('{{ str | forceescape }}', { str: r.markSafe('<html>')}, '&lt;html&gt;');
equal('{{ "<html>" | safe | forceescape }}', '&lt;html&gt;');
finish(done);
});

it('int', function() {
equal('{{ "3.5" | int }}', '3');
equal('{{ "0" | int }}', '0');
Expand Down