diff --git a/test/utility.js b/test/utility.js index 8619440cc..94f225a80 100644 --- a/test/utility.js +++ b/test/utility.js @@ -79,7 +79,9 @@ $(document).ready(function() { var quoteTemplate = _.template("It's its, not it's"); equals(quoteTemplate({}), "It's its, not it's"); - 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'."); var withNewlinesAndTabs = _.template('This\n\t\tis: <%= x %>.\n\tok.\nend.'); diff --git a/underscore.js b/underscore.js index 43caa3afa..3c1d4d844 100644 --- a/underscore.js +++ b/underscore.js @@ -623,8 +623,8 @@ // By default, Underscore uses ERB-style template delimiters, change the // following template settings to use alternative delimiters. _.templateSettings = { - evaluate : /<%(.+?)%>/g, - interpolate : /<%=(.+?)%>/g + evaluate : /<%(.+?)%>/gm, + interpolate : /<%=(.+?)%>/gm }; // JavaScript templating a-la ERB, pilfered from John Resig's