Fixed single quotes

tj · Jul 15, 2010 · f0b6f7f · f0b6f7f
1 parent 7de165a
commit f0b6f7f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/lib/ejs.js b/lib/ejs.js
@@ -67,7 +67,6 @@ var parse = exports.parse = function(str){
             .replace(/\n/g, "\\n")
             .split("<%").join("\t")
             .replace(/((^|%>)[^\t]*)'/g, "$1\r")
-            .split("'").join("\\'")
             .replace(/\t=(.*?)%>/g, "', escape($1) ,'")
             .replace(/\t-(.*?)%>/g, "', $1 ,'")
             .split("\t").join("');")

diff --git a/test/ejs.test.js b/test/ejs.test.js
@@ -50,5 +50,12 @@ module.exports = {
             str = '<% if (name) { %>\n<p><%= name %></p>\n<p><%= email %></p><% } %>',
             locals = { name: 'tj', email: 'tj@sencha.com' };
         assert.equal(html, ejs.render(str, { locals: locals }));
+    },
+
+    'test single quotes': function(assert){
+        var html = '<p>WAHOO</p>',
+            str = '<p><%= up(\'wahoo\') %></p>',
+            locals = { up: function(str){ return str.toUpperCase(); }};
+        assert.equal(html, ejs.render(str, { locals: locals, debug: true }));
     }
 };