From ac5d2a714e33b4d0896733784bdc4c458a4015ff Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Wed, 13 Mar 2013 10:13:59 -0700 Subject: [PATCH] Make `modern` build pass unit tests again. Former-commit-id: 6269bdbaa7cd96217568504921da097c2352cef8 --- build.js | 3 +++ dist/lodash.js | 12 ++++++------ dist/lodash.min.js | 8 ++++---- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/build.js b/build.js index 5f2f76fbd..20fe95bb6 100755 --- a/build.js +++ b/build.js @@ -1873,6 +1873,9 @@ } else if (/^(?:max|min)$/.test(methodName)) { match = match.replace(/\beach\(/, 'forEach('); + if (!isUnderscore) { + return match; + } } return match.replace(/^(( *)if *\(.*?\bisArray\([^\)]+\).*?\) *{\n)(( *)var index[^;]+.+\n+)/m, function(snippet, statement, indent, vars) { vars = vars diff --git a/dist/lodash.js b/dist/lodash.js index c93f3f7a3..da1806f92 100644 --- a/dist/lodash.js +++ b/dist/lodash.js @@ -2516,10 +2516,10 @@ var computed = -Infinity, result = computed; - var index = -1, - length = collection ? collection.length : 0; + if (!callback && isArray(collection)) { + var index = -1, + length = collection.length; - if (!callback && typeof length == 'number') { while (++index < length) { var value = collection[index]; if (value > result) { @@ -2585,10 +2585,10 @@ var computed = Infinity, result = computed; - var index = -1, - length = collection ? collection.length : 0; + if (!callback && isArray(collection)) { + var index = -1, + length = collection.length; - if (!callback && typeof length == 'number') { while (++index < length) { var value = collection[index]; if (value < result) { diff --git a/dist/lodash.min.js b/dist/lodash.min.js index 57def5734..2a63b5d3b 100644 --- a/dist/lodash.min.js +++ b/dist/lodash.min.js @@ -14,9 +14,9 @@ case S:return n!=+n?t!=+t:0==n?1/n==1/t:n==+t;case E:case I:return n==t+""}if(s= return p}return le(t,function(t,r,u){return Lt.call(u,r)?(h++,p=Lt.call(n,r)&&nt(n[r],t,e,o,i,f)):void 0}),p&&!c&&le(n,function(n,t,e){return Lt.call(e,t)?p=-1<--h:void 0}),p}function tt(n){return typeof n=="function"}function et(n){return n?B[typeof n]:a}function rt(n){return typeof n=="number"||Yt.call(n)==S}function ut(n){return typeof n=="string"||Yt.call(n)==I}function at(n,t,e){var r=arguments,u=0,a=2;if(!et(n))return n;if(e===l)var o=r[3],i=r[4],c=r[5];else i=[],c=[],typeof e!="number"&&(a=r.length),3e?ue(0,u+e):e)||0,typeof u=="number"?o=-1<(ut(n)?n.indexOf(t,e):dt(n,t,e)):pe(n,function(n){return++rr&&(r=e,u=n)});else for(;++au&&(u=e); -return u}function gt(n,t,e,r){if(!n)return e;var u=3>arguments.length;t=R.createCallback(t,r,4);var o=-1,i=n.length;if(typeof i=="number")for(u&&(e=n[++o]);++oarguments.length;if(typeof u!="number")var i=ve(n),u=i.length;return t=R.createCallback(t,r,4),pt(n,function(r,f,c){f=i?i[--u]:--u,e=o?(o=a,n[f]):t(e,n[f],f,c)}),e}function yt(n,t,e){var r;t=R.createCallback(t,e),e=-1; -var u=n?n.length:0;if(typeof u=="number")for(;++eu&&(u=o)}}else t=!t&&ut(n)?D:R.createCallback(t,e),pt(n,function(n,e,a){e=t(n,e,a),e>r&&(r=e,u=n)});return u +}function gt(n,t,e,r){if(!n)return e;var u=3>arguments.length;t=R.createCallback(t,r,4);var o=-1,i=n.length;if(typeof i=="number")for(u&&(e=n[++o]);++oarguments.length;if(typeof u!="number")var i=ve(n),u=i.length;return t=R.createCallback(t,r,4),pt(n,function(r,f,c){f=i?i[--u]:--u,e=o?(o=a,n[f]):t(e,n[f],f,c)}),e}function yt(n,t,e){var r;t=R.createCallback(t,e),e=-1;var u=n?n.length:0; +if(typeof u=="number")for(;++ee?ue(0,u+e):e||0)-1;else if(e)return r=kt(n,t),n[r]===t?r:-1;for(;++r>>1,e(n[r])dt(c,s))&&((e||l)&&c.push(s),f.push(r))}return f}function jt(n,t){for(var e=-1,r=n?n.length:0,u={};++edt(f,c)){o&&f.push(c);for(var p=e;--p;)if(!(r[p]||(r[p]=T(t[p],0,100)))(c))continue n;i.push(c)}}return i},R.invert=Z,R.invoke=function(n,t){var e=H(arguments,2),r=-1,u=typeof t=="function",a=n?n.length:0,o=Et(typeof a=="number"?a:0);return pt(n,function(n){o[++r]=(u?t:n[t]).apply(n,e) -}),o},R.keys=ve,R.map=st,R.max=vt,R.memoize=function(n,t){var e={};return function(){var r=(t?t.apply(this,arguments):arguments[0])+"";return Lt.call(e,r)?e[r]:e[r]=n.apply(this,arguments)}},R.merge=at,R.min=function(n,t,e){var r=1/0,u=r,a=-1,o=n?n.length:0;if(t||typeof o!="number")t=!t&&ut(n)?D:R.createCallback(t,e),pt(n,function(n,e,a){e=t(n,e,a),edt(a,e,1))&&(u[e]=n)}),u},R.once=function(n){var t,e;return function(){return t?e:(t=r,e=n.apply(this,arguments),n=u,e)}},R.pairs=function(n){for(var t=-1,e=ve(n),r=e.length,u=Et(r);++t