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

merging a variant of svieira's fix for preserving whitespace within templates.

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-07-20 13:37:27 -04:00
parent ef396a9e13
commit b2b5a5390b
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/utility.js
View File

@@ -69,6 +69,9 @@ $(document).ready(function() {
var quoteInStatementAndBody = _.template("<% if(foo == 'bar'){ %>Statement quotes and 'quotes'.<% } %>"); var quoteInStatementAndBody = _.template("<% if(foo == 'bar'){ %>Statement quotes and 'quotes'.<% } %>");
equals(quoteInStatementAndBody({foo: "bar"}), "Statement quotes and 'quotes'."); equals(quoteInStatementAndBody({foo: "bar"}), "Statement quotes and 'quotes'.");
var withNewlinesAndTabs = _.template('This\n\t\tis: <%= x %>.\n\tok.\nend.');
equals(withNewlinesAndTabs({x: 'that'}), 'This\n\t\tis: that.\n\tok.\nend.');
_.templateSettings = { _.templateSettings = {
start : '{{', start : '{{',
end : '}}', end : '}}',

10
underscore.js
View File

@@ -625,17 +625,19 @@
// JavaScript templating a-la ERB, pilfered from John Resig's // JavaScript templating a-la ERB, pilfered from John Resig's
// "Secrets of the JavaScript Ninja", page 83. // "Secrets of the JavaScript Ninja", page 83.
// Single-quote fix from Rick Strahl's version. // Single-quote fix from Rick Strahl's version.
// With alterations for arbitrary delimiters. // With alterations for arbitrary delimiters, and to preserve whitespace.
_.template = function(str, data) { _.template = function(str, data) {
var c = _.templateSettings; var c = _.templateSettings;
var endMatch = new RegExp("'(?=[^"+c.end.substr(0, 1)+"]*"+escapeRegExp(c.end)+")","g"); var endMatch = new RegExp("'(?=[^"+c.end.substr(0, 1)+"]*"+escapeRegExp(c.end)+")","g");
var fn = new Function('obj', var fn = new Function('obj',
'var p=[],print=function(){p.push.apply(p,arguments);};' + 'var p=[],print=function(){p.push.apply(p,arguments);};' +
'with(obj||{}){p.push(\'' + 'with(obj||{}){p.push(\'' +
str.replace(/[\r\t\n]/g, " ") str.replace(/\r/g, '\\r')
.replace(endMatch,"\t") .replace(/\n/g, '\\n')
.replace(/\t/g, '\\t')
.replace(endMatch,"✄")
.split("'").join("\\'") .split("'").join("\\'")
.split("\t").join("'") .split("✄").join("'")
.replace(c.interpolate, "',$1,'") .replace(c.interpolate, "',$1,'")
.split(c.start).join("');") .split(c.start).join("');")
.split(c.end).join("p.push('") .split(c.end).join("p.push('")