Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-09 02:17:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup fix for modularize underscore and _.mixin and add tests for correct indicatorObject use in underscore builds.

Browse Source 
Former-commit-id: 7700fb4df90cdc3eca47af037677d71a70908616
This commit is contained in:
John-David Dalton
2013-08-06 09:07:45 -07:00
parent 3c626e3ea5
commit fff5ae97f2
10 changed files with 317 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dist/lodash.min.js vendored
View File

@@ -18,7 +18,7 @@ return a&&(n=t[c]),(e.length||r.length)&&(de.apply(o,e),he.apply(o,r)),this inst
}function vt(n){return n&&typeof n=="object"?be.call(n)==T:m}function gt(n,t,e){var r=ze(n),u=r.length;for(t=et(t,e,3);u--&&(e=r[u],!(t(n[e],e,n)===false)););return n}function ht(n){var t=[];return x(n,function(n,e){_t(n)&&t.push(e)}),t.sort()}function yt(n){for(var t=-1,e=ze(n),r=e.length,u={};++t<r;){var o=e[t];u[n[o]]=o}return u}function _t(n){return typeof n=="function"}function mt(n){return!(!n||!G[typeof n])}function bt(n){return typeof n=="number"||be.call(n)==K}function dt(n){return typeof n=="string"||be.call(n)==U
}function wt(n){for(var t=-1,e=ze(n),r=e.length,u=Ht(r);++t<r;)u[t]=n[e[t]];return u}function jt(n,t,e){var r=-1,u=lt(),o=n?n.length:0,a=m;return e=(0>e?Ee(0,o+e):e)||0,o&&typeof o=="number"?a=-1<(dt(n)?n.indexOf(t,e):u(n,t,e)):d(n,function(n){return++r<e?void 0:!(a=n===t)}),a}function kt(n,t,e){var r=y;t=Z.createCallback(t,e,3),e=-1;var u=n?n.length:0;if(typeof u=="number")for(;++e<u&&(r=!!t(n[e],e,n)););else d(n,function(n,e,u){return r=!!t(n,e,u)});return r}function xt(n,t,e){var r=[];t=Z.createCallback(t,e,3),e=-1;
var u=n?n.length:0;if(typeof u=="number")for(;++e<u;){var o=n[e];t(o,e,n)&&r.push(o)}else d(n,function(n,e,u){t(n,e,u)&&r.push(n)});return r}function Ct(n,t,e){t=Z.createCallback(t,e,3),e=-1;var r=n?n.length:0;if(typeof r!="number"){var u;return d(n,function(n,e,r){return t(n,e,r)?(u=n,m):void 0}),u}for(;++e<r;){var o=n[e];if(t(o,e,n))return o}}function Ot(n,t,e){var r=-1,u=n?n.length:0;if(t=t&&typeof e=="undefined"?t:et(t,e,3),typeof u=="number")for(;++r<u&&t(n[r],r,n)!==false;);else d(n,t);return n
}function Et(n,t,e){var r=n?n.length:0;if(typeof r!="number")var u=ze(n),r=u.length;return t=et(t,e,3),Ot(n,function(e,o,a){o=u?u[--r]:--r,t(n[o],o,a)}),n}function It(n,t,e){var r=-1,u=n?n.length:0;if(t=Z.createCallback(t,e,3),typeof u=="number")for(var o=Ht(u);++r<u;)o[r]=t(n[r],r,n);else o=[],d(n,function(n,e,u){o[++r]=t(n,e,u)});return o}function St(n,t,e){var r=-1/0,o=r;if(!t&&Te(n)){e=-1;for(var a=n.length;++e<a;){var i=n[e];i>o&&(o=i)}}else t=!t&&dt(n)?u:Z.createCallback(t,e,3),Ot(n,function(n,e,u){e=t(n,e,u),e>r&&(r=e,o=n)
}function Et(n,t,e){var r=n?n.length:0;if(typeof r!="number")var u=ze(n),r=u.length;return t=et(t,e,3),Ot(n,function(e,o,a){return o=u?u[--r]:--r,t(n[o],o,a)}),n}function It(n,t,e){var r=-1,u=n?n.length:0;if(t=Z.createCallback(t,e,3),typeof u=="number")for(var o=Ht(u);++r<u;)o[r]=t(n[r],r,n);else o=[],d(n,function(n,e,u){o[++r]=t(n,e,u)});return o}function St(n,t,e){var r=-1/0,o=r;if(!t&&Te(n)){e=-1;for(var a=n.length;++e<a;){var i=n[e];i>o&&(o=i)}}else t=!t&&dt(n)?u:Z.createCallback(t,e,3),Ot(n,function(n,e,u){e=t(n,e,u),e>r&&(r=e,o=n)
});return o}function At(n,t){var e=-1,r=n?n.length:0;if(typeof r=="number")for(var u=Ht(r);++e<r;)u[e]=n[e][t];return u||It(n,t)}function Nt(n,t,e,r){if(!n)return e;var u=3>arguments.length;t=et(t,r,4);var o=-1,a=n.length;if(typeof a=="number")for(u&&(e=n[++o]);++o<a;)e=t(e,n[o],o,n);else d(n,function(n,r,o){e=u?(u=m,n):t(e,n,r,o)});return e}function Rt(n,t,e,r){var u=3>arguments.length;return t=et(t,r,4),Et(n,function(n,r,o){e=u?(u=m,n):t(e,n,r,o)}),e}function Bt(n,t,e){var r;t=Z.createCallback(t,e,3),e=-1;
var u=n?n.length:0;if(typeof u=="number")for(;++e<u&&!(r=t(n[e],e,n)););else d(n,function(n,e,u){return!(r=t(n,e,u))});return!!r}function $t(n){var r=-1,u=lt(),o=n?n.length:0,i=rt(arguments,y,y,1),f=[],c=o>=k&&u===t;if(c){var l=a(i);l?(u=e,i=l):c=m}for(;++r<o;)l=n[r],0>u(i,l)&&f.push(l);return c&&s(i),f}function Dt(n,t,e){if(n){var r=0,u=n.length;if(typeof t!="number"&&t!=_){var o=-1;for(t=Z.createCallback(t,e,3);++o<u&&t(n[o],o,n);)r++}else if(r=t,r==_||e)return n[0];return v(n,0,Ie(Ee(0,r),u))}}function Ft(n,e,r){if(typeof r=="number"){var u=n?n.length:0;
r=0>r?Ee(0,u+r):r||0}else if(r)return r=zt(n,e),n[r]===e?r:-1;return n?t(n,e,r):-1}function Tt(n,t,e){if(typeof t!="number"&&t!=_){var r=0,u=-1,o=n?n.length:0;for(t=Z.createCallback(t,e,3);++u<o&&t(n[u],u,n);)r++}else r=t==_||e?1:Ee(0,t);return v(n,r)}function zt(n,t,e,r){var u=0,o=n?n.length:u;for(e=e?Z.createCallback(e,r,1):Ut,t=e(t);u<o;)r=u+o>>>1,e(n[r])<t?u=r+1:o=r;return u}function qt(n,t,e,r){return typeof t!="boolean"&&t!=_&&(r=e,e=r&&r[t]===n?h:t,t=m),e!=_&&(e=Z.createCallback(e,r,3)),at(n,t,e)
@@ -28,9 +28,9 @@ r&&(e.prototype[u]=function(){var t=this.__wrapped__,r=[t];return he.apply(r,arg
$e[z]=Ht,$e[q]=Jt,$e[W]=Qt,$e[P]=Xt,$e[L]=ne,$e[K]=Zt,$e[M]=te,$e[U]=ee,nt.prototype=Z.prototype;var De=Z.support={};De.fastBind=we&&!Be,Z.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:N,variable:"",imports:{_:Z}};var Fe=le?function(n,t){var e=c();e.value=t,le(n,"__bindData__",e),s(e)}:l,Te=ke,ze=Oe?function(n){return mt(n)?Oe(n):[]}:X,qe={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"},We=yt(qe),Pe=te("("+ze(We).join("|")+")","g"),Ke=te("["+ze(qe).join("")+"]","g"),Le=it(function(n,t,e){ge.call(n,e)?n[e]++:n[e]=1
}),Me=it(function(n,t,e){(ge.call(n,e)?n[e]:n[e]=[]).push(t)}),Ue=it(function(n,t,e){n[e]=t});Be&&Q&&typeof ye=="function"&&(Mt=Kt(ye,r));var Ve=8==Se(C+"08")?Se:function(n,t){return Se(dt(n)?n.replace(R,""):n,t||0)};return Z.after=function(n,t){return function(){return 1>--n?t.apply(this,arguments):void 0}},Z.assign=J,Z.at=function(n){for(var t=-1,e=rt(arguments,y,m,1),r=e.length,u=Ht(r);++t<r;)u[t]=n[e[t]];return u},Z.bind=Kt,Z.bindAll=function(n){for(var t=1<arguments.length?rt(arguments,y,m,1):ht(n),e=-1,r=t.length;++e<r;){var u=t[e];
n[u]=Kt(n[u],n)}return n},Z.bindKey=function(n,t){return ft(n,t,Ne.call(arguments,2),[],m,y)},Z.chain=function(n){return n=new nt(n),n.__chain__=y,n},Z.compact=function(n){for(var t=-1,e=n?n.length:0,r=[];++t<e;){var u=n[t];u&&r.push(u)}return r},Z.compose=function(){var n=arguments;return function(){for(var t=arguments,e=n.length;e--;)t=[n[e].apply(this,t)];return t[0]}},Z.countBy=Le,Z.createCallback=function(n,t,e){var r=typeof n;if(n==_||"function"==r)return et(n,t,e);if("object"!=r)return function(t){return t[n]
};var u=ze(n),o=u[0],a=n[o];return 1!=u.length||a!==a||mt(a)?function(t){for(var e=u.length,r=m;e--&&(r=ut(t[u[e]],n[u[e]],_,y)););return r}:function(n){return n=n[o],a===n&&(0!==a||1/a==1/n)}},Z.debounce=Lt,Z.defaults=H,Z.defer=Mt,Z.delay=function(n,t){var e=Ne.call(arguments,2);return _e(function(){n.apply(h,e)},t)},Z.difference=$t,Z.filter=xt,Z.flatten=function(n,t,e,r){return typeof t!="boolean"&&t!=_&&(r=e,e=r&&r[t]===n?h:t,t=m),e!=_&&(n=It(n,e,r)),rt(n,t)},Z.forEach=Ot,Z.forEachRight=Et,Z.forIn=x,Z.forInRight=function(n,t,e){var r=-1,u=[];
x(n,function(n,t){u.push(n,t)});var o=u.length;for(t=et(t,e,3);++r<o&&t(u[r],u[++r],n)!==false;);return n},Z.forOwn=d,Z.forOwnRight=gt,Z.functions=ht,Z.groupBy=Me,Z.indexBy=Ue,Z.initial=function(n,t,e){if(!n)return[];var r=0,u=n.length;if(typeof t!="number"&&t!=_){var o=u;for(t=Z.createCallback(t,e,3);o--&&t(n[o],o,n);)r++}else r=t==_||e?1:t||r;return v(n,0,Ie(Ee(0,u-r),u))},Z.intersection=function(n){for(var r=arguments,u=r.length,o=-1,i=f(),c=-1,l=lt(),v=n?n.length:0,g=[],h=f();++o<u;){var y=r[o];
i[o]=l===t&&(y?y.length:0)>=k&&a(o?r[o]:h)}n:for(;++c<v;){var _=i[0],y=n[c];if(0>(_?e(_,y):l(h,y))){for(o=u,(_||h).push(y);--o;)if(_=i[o],0>(_?e(_,y):l(r[o],y)))continue n;g.push(y)}}for(;u--;)(_=i[u])&&s(_);return p(i),p(h),g},Z.invert=yt,Z.invoke=function(n,t){var e=Ne.call(arguments,2),r=-1,u=typeof t=="function",o=n?n.length:0,a=Ht(typeof o=="number"?o:0);return Ot(n,function(n){a[++r]=(u?t:n[t]).apply(n,e)}),a},Z.keys=ze,Z.map=It,Z.max=St,Z.memoize=function(n,t){function e(){var r=e.cache,u=j+(t?t.apply(this,arguments):arguments[0]);
};var u=ze(n),o=u[0],a=n[o];return 1!=u.length||a!==a||mt(a)?function(t){for(var e=u.length,r=m;e--&&(r=ut(t[u[e]],n[u[e]],_,y)););return r}:function(n){return n=n[o],a===n&&(0!==a||1/a==1/n)}},Z.debounce=Lt,Z.defaults=H,Z.defer=Mt,Z.delay=function(n,t){var e=Ne.call(arguments,2);return _e(function(){n.apply(h,e)},t)},Z.difference=$t,Z.filter=xt,Z.flatten=function(n,t,e,r){return typeof t!="boolean"&&t!=_&&(r=e,e=r&&r[t]===n?h:t,t=m),e!=_&&(n=It(n,e,r)),rt(n,t)},Z.forEach=Ot,Z.forEachRight=Et,Z.forIn=x,Z.forInRight=function(n,t,e){var r=[];
x(n,function(n,t){r.push(t,n)});var u=r.length;for(t=et(t,e,3);u--&&t(r[u--],r[u],n)!==false;);return n},Z.forOwn=d,Z.forOwnRight=gt,Z.functions=ht,Z.groupBy=Me,Z.indexBy=Ue,Z.initial=function(n,t,e){if(!n)return[];var r=0,u=n.length;if(typeof t!="number"&&t!=_){var o=u;for(t=Z.createCallback(t,e,3);o--&&t(n[o],o,n);)r++}else r=t==_||e?1:t||r;return v(n,0,Ie(Ee(0,u-r),u))},Z.intersection=function(n){for(var r=arguments,u=r.length,o=-1,i=f(),c=-1,l=lt(),v=n?n.length:0,g=[],h=f();++o<u;){var y=r[o];i[o]=l===t&&(y?y.length:0)>=k&&a(o?r[o]:h)
}n:for(;++c<v;){var _=i[0],y=n[c];if(0>(_?e(_,y):l(h,y))){for(o=u,(_||h).push(y);--o;)if(_=i[o],0>(_?e(_,y):l(r[o],y)))continue n;g.push(y)}}for(;u--;)(_=i[u])&&s(_);return p(i),p(h),g},Z.invert=yt,Z.invoke=function(n,t){var e=Ne.call(arguments,2),r=-1,u=typeof t=="function",o=n?n.length:0,a=Ht(typeof o=="number"?o:0);return Ot(n,function(n){a[++r]=(u?t:n[t]).apply(n,e)}),a},Z.keys=ze,Z.map=It,Z.max=St,Z.memoize=function(n,t){function e(){var r=e.cache,u=j+(t?t.apply(this,arguments):arguments[0]);
return ge.call(r,u)?r[u]:r[u]=n.apply(this,arguments)}return e.cache={},e},Z.merge=function(n){var t=arguments,e=2;if(!mt(n))return n;if("number"!=typeof t[2]&&(e=t.length),3<e&&"function"==typeof t[e-2])var r=et(t[--e-1],t[e--],2);else 2<e&&"function"==typeof t[e-1]&&(r=t[--e]);for(var t=Ne.call(arguments,1,e),u=-1,o=f(),a=f();++u<e;)ot(n,t[u],r,o,a);return p(o),p(a),n},Z.min=function(n,t,e){var r=1/0,o=r;if(!t&&Te(n)){e=-1;for(var a=n.length;++e<a;){var i=n[e];i<o&&(o=i)}}else t=!t&&dt(n)?u:Z.createCallback(t,e,3),Ot(n,function(n,e,u){e=t(n,e,u),e<r&&(r=e,o=n)
});return o},Z.omit=function(n,t,e){var r=lt(),u=typeof t=="function",o={};if(u)t=Z.createCallback(t,e,3);else var a=rt(arguments,y,m,1);return x(n,function(n,e,i){(u?!t(n,e,i):0>r(a,e))&&(o[e]=n)}),o},Z.once=function(n){var t,e;return function(){return t?e:(t=y,e=n.apply(this,arguments),n=_,e)}},Z.pairs=function(n){for(var t=-1,e=ze(n),r=e.length,u=Ht(r);++t<r;){var o=e[t];u[t]=[o,n[o]]}return u},Z.partial=function(n){return ft(n,_,Ne.call(arguments,1),[],y)},Z.partialRight=function(n){return ft(n,_,[],Ne.call(arguments,1),y,y)
},Z.pick=function(n,t,e){var r={};if(typeof t!="function")for(var u=-1,o=rt(arguments,y,m,1),a=mt(n)?o.length:0;++u<a;){var i=o[u];i in n&&(r[i]=n[i])}else t=Z.createCallback(t,e,3),x(n,function(n,e,u){t(n,e,u)&&(r[e]=n)});return r},Z.pluck=At,Z.pull=function(n){for(var t=arguments,e=0,r=t.length,u=n?n.length:0;++e<r;)for(var o=-1,a=t[e];++o<u;)n[o]===a&&(me.call(n,o--,1),u--);return n},Z.range=function(n,t,e){n=+n||0,e=typeof e=="number"?e:1,t==_&&(t=n,n=0);var r=-1;t=Ee(0,fe((t-n)/(e||1)));for(var u=Ht(t);++r<t;)u[r]=n,n+=e;
@@ -38,7 +38,7 @@ return u},Z.reject=function(n,t,e){return t=Z.createCallback(t,e,3),xt(n,functio
},Z.sortBy=function(n,t,e){var r=-1,u=n?n.length:0,a=Ht(typeof u=="number"?u:0);for(t=Z.createCallback(t,e,3),Ot(n,function(n,e,u){var o=a[++r]=c();o.l=t(n,e,u),o.m=r,o.n=n}),u=a.length,a.sort(o);u--;)n=a[u],a[u]=n.n,s(n);return a},Z.tap=function(n,t){return t(n),n},Z.throttle=function(n,t,e){var r=y,u=y;return e===false?r=m:mt(e)&&(r="leading"in e?e.leading:r,u="trailing"in e?e.trailing:u),e=c(),e.leading=r,e.maxWait=t,e.trailing=u,n=Lt(n,t,e),s(e),n},Z.times=function(n,t,e){n=-1<(n=+n)?n:0;var r=-1,u=Ht(n);
for(t=et(t,e,1);++r<n;)u[r]=t(r);return u},Z.toArray=function(n){return n&&typeof n.length=="number"?v(n):wt(n)},Z.transform=function(n,t,e,r){var u=Te(n);return t=et(t,r,4),e==_&&(u?e=[]:(r=n&&n.constructor,e=mt(r&&r.prototype)?je(r&&r.prototype):{})),(u?Ot:d)(n,function(n,r,u){return t(e,n,r,u)}),e},Z.union=function(){return at(rt(arguments,y,y))},Z.uniq=qt,Z.values=wt,Z.where=xt,Z.without=function(n){return $t(n,Ne.call(arguments,1))},Z.wrap=function(n,t){return function(){var e=[n];return he.apply(e,arguments),t.apply(this,e)
}},Z.zip=Wt,Z.zipObject=Pt,Z.collect=It,Z.drop=Tt,Z.each=Ot,Z.extend=J,Z.methods=ht,Z.object=Pt,Z.select=xt,Z.tail=Tt,Z.unique=qt,Z.unzip=Wt,Vt(Z),Z.clone=function(n,t,e,r){return typeof t!="boolean"&&t!=_&&(r=e,e=t,t=m),tt(n,t,typeof e=="function"&&et(e,r,1))},Z.cloneDeep=function(n,t,e){return tt(n,y,typeof t=="function"&&et(t,e,1))},Z.contains=jt,Z.escape=function(n){return n==_?"":ee(n).replace(Ke,ct)},Z.every=kt,Z.find=Ct,Z.findIndex=function(n,t,e){var r=-1,u=n?n.length:0;for(t=Z.createCallback(t,e,3);++r<u;)if(t(n[r],r,n))return r;
return-1},Z.findLast=function(n,t,e){var r;return t=Z.createCallback(t,e),Et(n,function(n,e,u){return t(n,e,u)?(r=n,m):void 0}),r},Z.findLastIndex=function(n,t,e){var r=n?n.length:0;for(t=Z.createCallback(t,e);r--&&!t(n[-1],-1,n););return-1},Z.findKey=function(n,t,e){var r;return t=Z.createCallback(t,e,3),d(n,function(n,e,u){return t(n,e,u)?(r=e,m):void 0}),r},Z.findLastKey=function(n,t,e){var r;return t=Z.createCallback(t,e),gt(n,function(n,e,u){return t(n,e,u)?(r=e,m):void 0}),r},Z.has=function(n,t){return n?ge.call(n,t):m
return-1},Z.findLast=function(n,t,e){var r;return t=Z.createCallback(t,e,3),Et(n,function(n,e,u){return t(n,e,u)?(r=n,m):void 0}),r},Z.findLastIndex=function(n,t,e){var r=n?n.length:0;for(t=Z.createCallback(t,e,3);r--;)if(t(n[r],r,n))return r;return-1},Z.findKey=function(n,t,e){var r;return t=Z.createCallback(t,e,3),d(n,function(n,e,u){return t(n,e,u)?(r=e,m):void 0}),r},Z.findLastKey=function(n,t,e){var r;return t=Z.createCallback(t,e,3),gt(n,function(n,e,u){return t(n,e,u)?(r=e,m):void 0}),r},Z.has=function(n,t){return n?ge.call(n,t):m
},Z.identity=Ut,Z.indexOf=Ft,Z.isArguments=vt,Z.isArray=Te,Z.isBoolean=function(n){return n===y||n===false||be.call(n)==q},Z.isDate=function(n){return n?typeof n=="object"&&be.call(n)==W:m},Z.isElement=function(n){return n?1===n.nodeType:m},Z.isEmpty=function(n){var t=y;if(!n)return t;var e=be.call(n),r=n.length;return e==z||e==U||e==T||e==L&&typeof r=="number"&&_t(n.splice)?!r:(d(n,function(){return t=m}),t)},Z.isEqual=function(n,t,e,r){return ut(n,t,typeof e=="function"&&et(e,r,2))},Z.isFinite=function(n){return xe(n)&&!Ce(parseFloat(n))
},Z.isFunction=_t,Z.isNaN=function(n){return bt(n)&&n!=+n},Z.isNull=function(n){return n===_},Z.isNumber=bt,Z.isObject=mt,Z.isPlainObject=b,Z.isRegExp=function(n){return n?typeof n=="object"&&be.call(n)==M:m},Z.isString=dt,Z.isUndefined=function(n){return typeof n=="undefined"},Z.lastIndexOf=function(n,t,e){var r=n?n.length:0;for(typeof e=="number"&&(r=(0>e?Ee(0,r+e):Ie(e,r-1))+1);r--;)if(n[r]===t)return r;return-1},Z.mixin=Vt,Z.noConflict=function(){return r._=ae,this},Z.parseInt=Ve,Z.random=function(n,t){n==_&&t==_&&(t=1),n=+n||0,t==_?(t=n,n=0):t=+t||0;
var e=Ae();return n%1||t%1?n+Ie(e*(t-n+parseFloat("1e-"+((e+"").length-1))),t):n+pe(e*(t-n+1))},Z.reduce=Nt,Z.reduceRight=Rt,Z.result=function(n,t){var e=n?n[t]:h;return _t(e)?n[t]():e},Z.runInContext=g,Z.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:ze(n).length},Z.some=Bt,Z.sortedIndex=zt,Z.template=function(n,t,e){var r=Z.templateSettings;n||(n=""),e=H({},e,r);var u,o=H({},e.imports,r.imports),r=ze(o),o=wt(o),a=0,f=e.interpolate||B,c="__p+='",f=te((e.escape||B).source+"|"+f.source+"|"+(f===N?S:B).source+"|"+(e.evaluate||B).source+"|$","g");