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

filter.escape should not escape SafeString, close #618 #623

Merged
merged 1 commit into from
Jan 6, 2016
Merged

filter.escape should not escape SafeString, close #618 #623

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
Expand Up @@ -3,6 +3,7 @@ Changelog

master (unreleased)
-------------------
* Fix: [Breaking Change] filter.escape should not escape SafeString(#168).

v2.2.0 (Nov 23 2015)
--------------------
Expand Down
3 changes: 1 addition & 2 deletions src/filters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,7 @@ var filters = {
},

escape: function(str) {
if(typeof str === 'string' ||
str instanceof r.SafeString) {
if(typeof str === 'string') {
return lib.escape(str);
}
return str;
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 @@ -91,6 +91,12 @@
finish(done);
});

it('escape skip safe', function(done) {
var res = render('{{ "<html>" | safe | escape }}', {}, { autoescape: false });
expect(res).to.be('<html>');
finish(done);
});

it('dictsort', function(done) {
// no real foolproof way to test that a js obj has been transformed
// from unsorted -> sorted, as its enumeration ordering is undefined
Expand Down