From 25de44a23d9fa7a05073a7ce80af17d10ae005ae Mon Sep 17 00:00:00 2001
From: John-David Dalton <john.david.dalton@gmail.com>
Date: Wed, 19 Sep 2012 00:29:32 -0700
Subject: [PATCH] Cleanup `_.template`.

Former-commit-id: dc3fa2d02a9a4a2d4034136d2ce7f03d0b67224a
---
 build/pre-compile.js |  2 +-
 lodash.js            | 16 ++++++++--------
 lodash.min.js        |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build/pre-compile.js b/build/pre-compile.js
index e22c1ba64..e564f75a7 100644
--- a/build/pre-compile.js
+++ b/build/pre-compile.js
@@ -298,7 +298,7 @@
     source = source.replace(/(?:\n +\/\*[^*]*\*+(?:[^\/][^*]*\*+)*\/)?\n *try *\{(?:\s*\/\/.*)*\n *var useSourceURL[\s\S]+?catch[^}]+}\n/, '');
 
     // remove debug sourceURL use in `_.template`
-    source = source.replace(/(?:\s*\/\/.*\n)* *if *\(useSourceURL[^}]+}/, '');
+    source = source.replace(/(?:\s*\/\/.*\n)* *var sourceURL[^;]+;|\+ *sourceURL/g, '');
 
     // minify internal properties used by 'compareAscending', `_.merge`, and `_.sortBy`
     (function() {
diff --git a/lodash.js b/lodash.js
index 98644ad31..4b6e67594 100644
--- a/lodash.js
+++ b/lodash.js
@@ -3883,9 +3883,9 @@
 
       // replace delimiters with snippets
       source +=
-        escapeValue ?      "' +\n__e(" + escapeValue + ") +\n'" :
-        interpolateValue ? "' +\n((__t = (" + interpolateValue + ")) == null ? '' : __t) +\n'" :
-        evaluateValue ?    "';\n" + evaluateValue + ";\n__p += '" : '';
+        escapeValue ? "' +\n__e(" + escapeValue + ") +\n'" :
+        evaluateValue ? "';\n" + evaluateValue + ";\n__p += '" :
+        interpolateValue ? "' +\n((__t = (" + interpolateValue + ")) == null ? '' : __t) +\n'" : '';
 
       isEvaluating || (isEvaluating = evaluateValue || reComplexDelimiter.test(escapeValue || interpolateValue));
       index = offset + match.length;
@@ -3927,14 +3927,14 @@
       source +
       'return __p\n}';
 
-    // add a sourceURL for easier debugging
+    // use a sourceURL for easier debugging
     // http://www.html5rocks.com/en/tutorials/developertools/sourcemaps/#toc-sourceurl
-    if (useSourceURL) {
-      source += '\n//@ sourceURL=/lodash/template/source[' + (templateCounter++) + ']';
-    }
+    var sourceURL = useSourceURL
+      ? '\n//@ sourceURL=/lodash/template/source[' + (templateCounter++) + ']'
+      : '';
 
     try {
-      result = Function('_', 'return ' + source)(lodash);
+      result = Function('_', 'return ' + source + sourceURL)(lodash);
     } catch(e) {
       e.source = source;
       throw e;
diff --git a/lodash.min.js b/lodash.min.js
index 874ff8f0c..fbfc2bcce 100644
--- a/lodash.min.js
+++ b/lodash.min.js
@@ -32,7 +32,7 @@ g,s.isNaN=function(e){return tt.call(e)==dt&&e!=+e},s.isNull=function(e){return
 N,s.memoize=function(e,t){var n={};return function(){var r=t?t.apply(this,arguments):arguments[0];return G.call(n,r)?n[r]:n[r]=e.apply(this,arguments)}},s.merge=sn,s.min=function(e,t,n){var r=Infinity,i=r;if(!e)return i;var s=-1,o=e.length;if(!t){for(;++s<o;)e[s]<i&&(i=e[s]);return i}for(n&&(t=u(t,n));++s<o;)n=t(e[s],s,e),n<r&&(r=n,i=e[s]);return i},s.mixin=M,s.noConflict=function(){return e._=j,this},s.object=function(e,t){if(!e)return{};for(var n=-1,r=e.length,i={};++n<r;)t?i[e[n]]=t[n]:i[e[n][0
 ]]=e[n][1];return i},s.omit=on,s.once=function(e){var t,s=i;return function(){return s?t:(s=n,t=e.apply(this,arguments),e=r,t)}},s.pairs=un,s.partial=function(e){return l(e,et.call(arguments,1))},s.pick=an,s.pluck=bn,s.random=function(e,t){return e==r&&t==r&&(t=1),e=+e||0,t==r&&(t=e,e=0),e+rt(ft()*((+t||0)-e+1))},s.range=function(e,t,n){e=+e||0,n=+n||1,t==r&&(t=e,e=0);for(var i=-1,t=ut(0,Math.ceil((t-e)/n)),s=Array(t);++i<t;)s[i]=e,e+=n;return s},s.reduce=wn,s.reduceRight=E,s.reject=En,s.rest=C,s
 .result=function(e,t){if(!e)return r;var n=e[t];return g(n)?e[t]():n},s.shuffle=function(e){if(!e)return[];for(var t,n=-1,r=e.length,i=Array(r);++n<r;)t=rt(ft()*(n+1)),i[n]=i[t],i[t]=e[n];return i},s.size=function(e){if(!e)return 0;var t=e.length;return t===+t?t:rn(e).length},s.some=Sn,s.sortBy=xn,s.sortedIndex=k,s.tap=function(e,t){return t(e),e},s.template=function(e,t,n){n||(n={});var e=e+"",r,i,o=0,u=s.templateSettings,a="__p += '",f=n.variable||u.variable,l=f;e.replace(RegExp((n.escape||u.escape||
-V).source+"|"+(n.interpolate||u.interpolate||V).source+"|"+(n.evaluate||u.evaluate||V).source+"|$","g"),function(t,n,i,s,u){a+=e.slice(o,u).replace(J,h),a+=n?"'+__e("+n+")+'":i?"'+((__t=("+i+"))==null?'':__t)+'":s?"';"+s+";__p+='":"",r||(r=s||F.test(n||i)),o=u+t.length}),a+="';",l||(f="obj",r?a="with("+f+"){"+a+"}":(n=RegExp("(\\(\\s*)"+f+"\\."+f+"\\b","g"),a=a.replace(W,"$&"+f+".").replace(n,"$1__d"))),a=(r?a.replace(q,""):a).replace(R,"$1").replace(U,"$1;"),a="function("+f+"){"+(l?"":f+"||("+f+"={});"
+V).source+"|"+(n.interpolate||u.interpolate||V).source+"|"+(n.evaluate||u.evaluate||V).source+"|$","g"),function(t,n,i,s,u){a+=e.slice(o,u).replace(J,h),a+=n?"'+__e("+n+")+'":s?"';"+s+";__p+='":i?"'+((__t=("+i+"))==null?'':__t)+'":"",r||(r=s||F.test(n||i)),o=u+t.length}),a+="';",l||(f="obj",r?a="with("+f+"){"+a+"}":(n=RegExp("(\\(\\s*)"+f+"\\."+f+"\\b","g"),a=a.replace(W,"$&"+f+".").replace(n,"$1__d"))),a=(r?a.replace(q,""):a).replace(R,"$1").replace(U,"$1;"),a="function("+f+"){"+(l?"":f+"||("+f+"={});"
 )+"var __t,__p='',__e=_.escape"+(r?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":(l?"":",__d="+f+"."+f+"||"+f)+";")+a+"return __p}";try{i=Function("_","return "+a)(s)}catch(c){throw c.source=a,c}return t?i(t):(i.source=a,i)},s.throttle=function(e,t){function n(){a=new Date,u=r,s=e.apply(o,i)}var i,s,o,u,a=0;return function(){var r=new Date,f=t-(r-a);return i=arguments,o=this,0>=f?(a=r,s=e.apply(o,i)):u||(u=bt(n,f)),s}},s.times=function(e,t,n){var r=-1,i=Array(e||0);if(
 n)for(;++r<e;)i[r]=t.call(n,r);else for(;++r<e;)i[r]=t(r);return i},s.toArray=function(e){if(!e)return[];var t=e.length;return t===+t?(Nt?tt.call(e)==gt:"string"==typeof e)?e.split(""):et.call(e):fn(e)},s.unescape=function(e){return e==r?"":(e+"").replace(I,v)},s.union=function(){for(var e=-1,t=[],n=Q.apply(t,arguments),r=n.length;++e<r;)0>T(t,n[e])&&t.push(n[e]);return t},s.uniq=L,s.uniqueId=function(e){var t=H++;return e?e+t:t},s.values=fn,s.where=Tn,s.without=function(e){var t=[];if(!e)return t
 ;for(var n=-1,r=e.length,i=a(arguments,1,20);++n<r;)i(e[n])||t.push(e[n]);return t},s.wrap=function(e,t){return function(){var n=[e];return arguments.length&&Y.apply(n,arguments),t.apply(this,n)}},s.zip=function(e){if(!e)return[];for(var t=-1,n=N(bn(arguments,"length")),r=Array(n);++t<n;)r[t]=bn(arguments,t);return r},s.all=hn,s.any=Sn,s.collect=yn,s.detect=dn,s.drop=C,s.each=vn,s.foldl=wn,s.foldr=E,s.head=S,s.include=ln,s.inject=wn,s.methods=en,s.select=pn,s.tail=C,s.take=S,s.unique=L,vn({Date:pt