Underscore 0.5.4 -- bugfix for single quotes in _.template strings

index.html

@@ -113,11 +113,11 @@ <h2>Downloads <i style="padding-left: 12px; font-size:12px;">(Right-click, and u
     <p>
       <table>
         <tr>
-          <td><a href="underscore.js">Development Version (0.5.3)</a></td>
+          <td><a href="underscore.js">Development Version (0.5.4)</a></td>
           <td><i>22kb, Uncompressed with Comments</i></td>
         </tr>
         <tr>
-          <td><a href="underscore-min.js">Production Version (0.5.3)</a></td>
+          <td><a href="underscore-min.js">Production Version (0.5.4)</a></td>
           <td><i>3kb, Packed and Gzipped</i></td>
         </tr>
       </table>
@@ -1067,6 +1067,13 @@ <h2>Links &amp; Suggested Reading</h2>
 
       <h2>Change Log</h2>
 
+      <p>
+        <b class="header">0.5.4</b><br />
+        Fix for multiple single quotes within a template string for 
+        <tt>_.template</tt>. See: 
+        <a href="http://www.west-wind.com/Weblog/posts/509108.aspx">Rick Strahl's blog post</a>.
+      </p>
+
       <p>
         <b class="header">0.5.2</b><br />
         New implementations of <tt>isArray</tt>, <tt>isDate</tt>, <tt>isFunction</tt>, 

underscore.js

@@ -38,7 +38,7 @@
       propertyIsEnumerable  = Object.prototype.propertyIsEnumerable;
 
   // Current version.
-  _.VERSION = '0.5.3';
+  _.VERSION = '0.5.4';
 
   // ------------------------ Collection Functions: ---------------------------
 
@@ -561,19 +561,19 @@
 
   // JavaScript templating a-la ERB, pilfered from John Resig's
   // "Secrets of the JavaScript Ninja", page 83.
+  // Single-quote fix from Rick Strahl's version.
   _.template = function(str, data) {
     var fn = new Function('obj',
       'var p=[],print=function(){p.push.apply(p,arguments);};' +
       'with(obj){p.push(\'' +
-      str
-        .replace(/[\r\t\n]/g, " ")
-        .split("<%").join("\t")
-        .replace(/((^|%>)[^\t]*)'/g, "$1\r")
-        .replace(/\t=(.*?)%>/g, "',$1,'")
-        .split("\t").join("');")
-        .split("%>").join("p.push('")
-        .split("\r").join("\\'")
-    + "');}return p.join('');");
+      str.replace(/[\r\t\n]/g, " ")
+         .replace(/'(?=[^%]*%>)/g,"\t")
+         .split("'").join("\\'")
+         .split("\t").join("'")
+         .replace(/<%=(.+?)%>/g, "',$1,'")
+         .split("<%").join("');")
+         .split("%>").join("p.push('")
+         + "');}return p.join('');");
     return data ? fn(data) : fn;
   };