Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-06 17:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #506 from braddunbar/line-terminators

Browse Source 
Handle \u2028 & \u2029 in _.template.
This commit is contained in:
Jeremy Ashkenas
2012-03-12 16:41:18 -07:00
parent 144dcb1828 826e743262
commit ba3e31b53e
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/utility.js
View File

@@ -160,4 +160,9 @@ $(document).ready(function() {
equal(templateWithNull({planet : "world"}), "a null undefined world", "can handle missing escape and evaluate settings"); equal(templateWithNull({planet : "world"}), "a null undefined world", "can handle missing escape and evaluate settings");
}); });
test('_.template handles \\u2028 & \\u2029', function() {
var tmpl = _.template('<p>\u2028<%= "\\u2028\\u2029" %>\u2029</p>');
strictEqual(tmpl(), '<p>\u2028\u2028\u2029\u2029</p>');
});
}); });

6
underscore.js
View File

@@ -905,13 +905,15 @@
// Within an interpolation, evaluation, or escaping, remove HTML escaping // Within an interpolation, evaluation, or escaping, remove HTML escaping
// that had been previously added. // that had been previously added.
var unescape = function(code) { var unescape = function(code) {
return code.replace(/\\(\\|'|r|n|t)/g, function(match, char) { return code.replace(/\\(\\|'|r|n|t|u2028|u2029)/g, function(match, char) {
switch (char) { switch (char) {
case '\\': return '\\'; case '\\': return '\\';
case "'": return "'"; case "'": return "'";
case 'r': return '\r'; case 'r': return '\r';
case 'n': return '\n'; case 'n': return '\n';
case 't': return '\t'; case 't': return '\t';
case 'u2028': return '\u2028';
case 'u2029': return '\u2029';
} }
}); });
}; };
@@ -928,6 +930,8 @@
.replace(/\r/g, '\\r') .replace(/\r/g, '\\r')
.replace(/\n/g, '\\n') .replace(/\n/g, '\\n')
.replace(/\t/g, '\\t') .replace(/\t/g, '\\t')
.replace(/\u2028/g, '\\u2028')
.replace(/\u2029/g, '\\u2029')
.replace(c.escape || noMatch, function(match, code) { .replace(c.escape || noMatch, function(match, code) {
return "',_.escape(" + unescape(code) + "),\n'"; return "',_.escape(" + unescape(code) + "),\n'";
}) })