Ensure each is converted to forEach when used in a ternary operation.

Former-commit-id: ff42e367f9987726fd561037337081c63c7a5100
This commit is contained in:
John-David Dalton
2013-05-19 14:23:35 -07:00
parent a2088fa500
commit 16242f98ce
6 changed files with 6 additions and 5 deletions

View File

@@ -2806,6 +2806,7 @@
.replace(matchFunction(source, 'each'), '')
.replace(/^ *lodash\._each *=.+\n/gm, '')
.replace(/\beach(?=\(collection)/g, 'forOwn')
.replace(/(\?\s*)each(?=\s*:)/g, '$1forEach')
.replace(/\beach(?=\(\[)/g, 'forEach');
}
// modify `_.contains`, `_.every`, `_.find`, and `_.some` to use the private `indicatorObject`

View File

@@ -1266,7 +1266,7 @@
stackB.push(result);
// recursively populate clone (susceptible to call stack limits)
(isArr ? forEach : forOwn)(value, function(objValue, key) {
(isArr ? each : forOwn)(value, function(objValue, key) {
result[key] = clone(objValue, deep, callback, undefined, stackA, stackB);
});

View File

@@ -9,7 +9,7 @@ return a||(n=t[i]),r.length&&(e=e.length?(e=mr.call(e),c?e.concat(r):r.concat(e)
var u=[];if(wr.enumPrototypes&&u.push('!(E&&m=="prototype")'),wr.enumErrorProps&&u.push('!(D&&(m=="message"||m=="name"))'),t.i&&t.j)e+="var A=-1,B=z[typeof r]?t(r):[],s=B.length;while(++A<s){m=B[A];",u.length&&(e+="if("+u.join("&&")+"){"),e+=t.f+";",u.length&&(e+="}"),e+="}";else if(e+="for(m in r){",t.i&&u.push("l.call(r, m)"),u.length&&(e+="if("+u.join("&&")+"){"),e+=t.f+";",u.length&&(e+="}"),e+="}",wr.nonEnumShadows){for(e+="if(r!==y){var h=r.constructor,p=r===(h&&h.prototype),e=r===H?G:r===j?i:J.call(r),v=w[e];",k=0;7>k;k++)e+="m='"+t.g[k]+"';if((!(p&&v[m])&&l.call(r,m))",t.i||(e+="||(!v[m]&&r[m]!==y[m])"),e+="){"+t.f+"}";
e+="}"}return(t.b||wr.nonEnumArgs)&&(e+="}"),e+=t.c+";return C",n("i,j,l,n,o,q,t,u,y,z,w,G,H,J",r+e+"}")(A,Kt,tr,Z,Er,it,Sr,a,Mt,$,Cr,z,Ut,or)}function J(n){return at(n)?cr(n):{}}function K(n){return"\\"+q[n]}function M(n){return Ir[n]}function U(n){return typeof n.toString!="function"&&typeof(n+"")=="string"}function V(n){this.__wrapped__=n}function Q(){}function W(n){var t=!1;if(!n||or.call(n)!=N||!wr.argsClass&&Z(n))return t;var r=n.constructor;return(ut(r)?r instanceof r:wr.nodeClass||!U(n))?wr.ownLast?(zr(n,function(n,r,e){return t=tr.call(e,r),!1
}),!0===t):(zr(n,function(n,r){t=r}),!1===t||tr.call(n,t)):t}function X(n,t,r){t||(t=0),typeof r=="undefined"&&(r=n?n.length:0);var e=-1;r=r-t||0;for(var u=zt(0>r?0:r);++e<r;)u[e]=n[t+e];return u}function Y(n){return Br[n]}function Z(n){return or.call(n)==x}function nt(n,t,e,u,o,i){var c=n;if(typeof t!="boolean"&&null!=t&&(u=e,e=t,t=!1),typeof e=="function"){if(e=typeof u=="undefined"?e:a.createCallback(e,u,1),c=e(c),typeof c!="undefined")return c;c=n}if(u=at(c)){var l=or.call(c);if(!F[l]||!wr.nodeClass&&U(c))return c;
var f=Er(c)}if(!u||!t)return u?f?X(c):Nr({},c):c;switch(u=_r[l],l){case O:case S:return new u(+c);case B:case z:return new u(c);case P:return u(c.source,h.exec(c))}for(o||(o=[]),i||(i=[]),l=o.length;l--;)if(o[l]==n)return i[l];return c=f?u(c.length):{},f&&(tr.call(n,"index")&&(c.index=n.index),tr.call(n,"input")&&(c.input=n.input)),o.push(n),i.push(c),(f?gt:Fr)(n,function(n,u){c[u]=nt(n,t,e,r,o,i)}),c}function tt(n){var t=[];return zr(n,function(n,r){ut(n)&&t.push(r)}),t.sort()}function rt(n){for(var t=-1,r=Sr(n),e=r.length,u={};++t<e;){var a=r[t];
var f=Er(c)}if(!u||!t)return u?f?X(c):Nr({},c):c;switch(u=_r[l],l){case O:case S:return new u(+c);case B:case z:return new u(c);case P:return u(c.source,h.exec(c))}for(o||(o=[]),i||(i=[]),l=o.length;l--;)if(o[l]==n)return i[l];return c=f?u(c.length):{},f&&(tr.call(n,"index")&&(c.index=n.index),tr.call(n,"input")&&(c.input=n.input)),o.push(n),i.push(c),(f?Ar:Fr)(n,function(n,u){c[u]=nt(n,t,e,r,o,i)}),c}function tt(n){var t=[];return zr(n,function(n,r){ut(n)&&t.push(r)}),t.sort()}function rt(n){for(var t=-1,r=Sr(n),e=r.length,u={};++t<e;){var a=r[t];
u[n[a]]=a}return u}function et(n,t,r,e,u,o){var c=r===i;if(typeof r=="function"&&!c){r=a.createCallback(r,e,2);var l=r(n,t);if(typeof l!="undefined")return!!l}if(n===t)return 0!==n||1/n==1/t;var f=typeof n,p=typeof t;if(n===n&&(!n||"function"!=f&&"object"!=f)&&(!t||"function"!=p&&"object"!=p))return!1;if(null==n||null==t)return n===t;if(p=or.call(n),f=or.call(t),p==x&&(p=N),f==x&&(f=N),p!=f)return!1;switch(p){case O:case S:return+n==+t;case B:return n!=+n?t!=+t:0==n?1/n==1/t:n==+t;case P:case z:return n==Gt(t)
}if(f=p==E,!f){if(tr.call(n,"__wrapped__")||tr.call(t,"__wrapped__"))return et(n.__wrapped__||n,t.__wrapped__||t,r,e,u,o);if(p!=N||!wr.nodeClass&&(U(n)||U(t)))return!1;var p=!wr.argsObject&&Z(n)?Tt:n.constructor,s=!wr.argsObject&&Z(t)?Tt:t.constructor;if(p!=s&&(!ut(p)||!(p instanceof p&&ut(s)&&s instanceof s)))return!1}for(u||(u=[]),o||(o=[]),p=u.length;p--;)if(u[p]==n)return o[p]==t;var v=0,l=!0;if(u.push(n),o.push(t),f){if(p=n.length,v=t.length,l=v==n.length,!l&&!c)return l;for(;v--;)if(f=p,s=t[v],c)for(;f--&&!(l=et(n[f],s,r,e,u,o)););else if(!(l=et(n[v],s,r,e,u,o)))break;
return l}return zr(t,function(t,a,i){return tr.call(i,a)?(v++,l=tr.call(n,a)&&et(n[a],t,r,e,u,o)):void 0}),l&&!c&&zr(n,function(n,t,r){return tr.call(r,t)?l=-1<--v:void 0}),l}function ut(n){return typeof n=="function"}function at(n){return!(!n||!$[typeof n])}function ot(n){return typeof n=="number"||or.call(n)==B}function it(n){return typeof n=="string"||or.call(n)==z}function ct(n,t,r){var e=arguments,u=0,o=2;if(!at(n))return n;if(r===i)var c=e[3],l=e[4],f=e[5];else l=[],f=[],typeof r!="number"&&(o=e.length),3<o&&"function"==typeof e[o-2]?c=a.createCallback(e[--o-1],e[o--],2):2<o&&"function"==typeof e[o-1]&&(c=e[--o]);

2
dist/lodash.js vendored
View File

@@ -1993,7 +1993,7 @@
accumulator = createObject(proto);
}
}
(isArr ? each : forOwn)(object, function(value, index, object) {
(isArr ? forEach : forOwn)(object, function(value, index, object) {
return callback(accumulator, value, index, object);
});
return accumulator;

2
dist/lodash.min.js vendored
View File

@@ -32,7 +32,7 @@ return te.call(r,u)?r[u]:r[u]=n.apply(this,arguments)}return e.cache={},e},V.mer
return function(){return t?e:(t=r,e=n.apply(this,arguments),n=u,e)}},V.pairs=function(n){for(var t=-1,e=_e(n),r=e.length,u=Tt(r);++t<r;){var a=e[t];u[t]=[a,n[a]]}return u},V.partial=function(n){return L(n,he.call(arguments,1))},V.partialRight=function(n){return L(n,he.call(arguments,1),u,l)},V.pick=function(n,t,e){var r={};if(typeof t!="function")for(var u=-1,a=Yt.apply(Ht,he.call(arguments,1)),o=ot(n)?a.length:0;++u<o;){var i=a[u];i in n&&(r[i]=n[i])}else t=V.createCallback(t,e),P(n,function(n,e,u){t(n,e,u)&&(r[e]=n)
});return r},V.pluck=mt,V.range=function(n,t,e){n=+n||0,e=+e||1,t==u&&(t=n,n=0);var r=-1;t=se(0,Wt((t-n)/e));for(var a=Tt(t);++r<t;)a[r]=n,n+=e;return a},V.reject=function(n,t,e){return t=V.createCallback(t,e),vt(n,function(n,e,r){return!t(n,e,r)})},V.rest=Ot,V.shuffle=function(n){var t=-1,e=n?n.length:0,r=Tt(typeof e=="number"?e:0);return yt(n,function(n){var e=Zt(ye()*(++t+1));r[t]=r[e],r[e]=n}),r},V.sortBy=function(n,t,e){var r=-1,u=n?n.length:0,a=Tt(typeof u=="number"?u:0);for(t=V.createCallback(t,e),yt(n,function(n,e,u){a[++r]={a:t(n,e,u),b:r,c:n}
}),u=a.length,a.sort(J);u--;)a[u]=a[u].c;return a},V.tap=function(n,t){return t(n),n},V.throttle=function(n,t,e){function o(){l=u,v&&(p=new Dt,f=n.apply(c,i))}var i,f,c,l,p=0,s=r,v=r;return e===a?s=a:ot(e)&&(s="leading"in e?e.leading:s,v="trailing"in e?e.trailing:v),function(){var e=new Dt;!l&&!s&&(p=e);var r=t-(e-p);return i=arguments,c=this,0<r?l||(l=ue(o,r)):(Xt(l),l=u,p=e,f=n.apply(c,i)),f}},V.times=function(n,t,e){n=-1<(n=+n)?n:0;var r=-1,u=Tt(n);for(t=V.createCallback(t,e,1);++r<n;)u[r]=t(r);
return u},V.toArray=function(n){return n&&typeof n.length=="number"?Z(n):lt(n)},V.transform=function(n,t,e,r){var a=de(n);return t=V.createCallback(t,r,4),e==u&&(a?e=[]:(r=n&&n.constructor,e=ot(r&&r.prototype)?ie(r&&r.prototype):{})),(a?each:z)(n,function(n,r,u){return t(e,n,r,u)}),e},V.union=function(n){return de(n)||(arguments[0]=n?he.call(n):Ht),It(Yt.apply(Ht,arguments))},V.uniq=It,V.unzip=Nt,V.values=lt,V.where=vt,V.without=function(n){return wt(n,he.call(arguments,1))},V.wrap=function(n,t){return function(){var e=[n];
return u},V.toArray=function(n){return n&&typeof n.length=="number"?Z(n):lt(n)},V.transform=function(n,t,e,r){var a=de(n);return t=V.createCallback(t,r,4),e==u&&(a?e=[]:(r=n&&n.constructor,e=ot(r&&r.prototype)?ie(r&&r.prototype):{})),(a?yt:z)(n,function(n,r,u){return t(e,n,r,u)}),e},V.union=function(n){return de(n)||(arguments[0]=n?he.call(n):Ht),It(Yt.apply(Ht,arguments))},V.uniq=It,V.unzip=Nt,V.values=lt,V.where=vt,V.without=function(n){return wt(n,he.call(arguments,1))},V.wrap=function(n,t){return function(){var e=[n];
return ee.apply(e,arguments),t.apply(this,e)}},V.zip=function(n){return n?Nt(arguments):[]},V.zipObject=St,V.collect=ht,V.drop=Ot,V.each=yt,V.extend=M,V.methods=et,V.object=St,V.select=vt,V.tail=Ot,V.unique=It,Ft(V),V.chain=V,V.prototype.chain=function(){return this},V.clone=tt,V.cloneDeep=function(n,t,e){return tt(n,r,t,e)},V.contains=pt,V.escape=function(n){return n==u?"":Vt(n).replace(C,W)},V.every=st,V.find=gt,V.findIndex=function(n,t,e){var r=-1,u=n?n.length:0;for(t=V.createCallback(t,e);++r<u;)if(t(n[r],r,n))return r;
return-1},V.findKey=function(n,t,e){var r;return t=V.createCallback(t,e),z(n,function(n,e,u){return t(n,e,u)?(r=e,a):void 0}),r},V.has=function(n,t){return n?te.call(n,t):a},V.identity=Bt,V.indexOf=xt,V.isArguments=function(n){return ae.call(n)==O},V.isArray=de,V.isBoolean=function(n){return n===r||n===a||ae.call(n)==I},V.isDate=function(n){return n?typeof n=="object"&&ae.call(n)==N:a},V.isElement=function(n){return n?1===n.nodeType:a},V.isEmpty=function(n){var t=r;if(!n)return t;var e=ae.call(n),u=n.length;
return e==E||e==F||e==O||e==$&&typeof u=="number"&&at(n.splice)?!u:(z(n,function(){return t=a}),t)},V.isEqual=ut,V.isFinite=function(n){return ce(n)&&!le(parseFloat(n))},V.isFunction=at,V.isNaN=function(n){return it(n)&&n!=+n},V.isNull=function(n){return n===u},V.isNumber=it,V.isObject=ot,V.isPlainObject=f,V.isRegExp=function(n){return n?typeof n=="object"&&ae.call(n)==B:a},V.isString=ft,V.isUndefined=function(n){return typeof n=="undefined"},V.lastIndexOf=function(n,t,e){var r=n?n.length:0;for(typeof e=="number"&&(r=(0>e?se(0,r+e):ve(e,r-1))+1);r--;)if(n[r]===t)return r;

View File

@@ -1284,7 +1284,7 @@
stackB.push(result);
// recursively populate clone (susceptible to call stack limits)
(isArr ? forEach : forOwn)(value, function(objValue, key) {
(isArr ? each : forOwn)(value, function(objValue, key) {
result[key] = clone(objValue, deep, callback, undefined, stackA, stackB);
});