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

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

View File

@@ -18,13 +18,13 @@ r+="}"}return(n.b||$e.nonEnumArgs)&&(r+="}"),r+=n.c+";return E",t=t("d,j,k,m,o,p
}),e===y||ve.call(n,e))}function st(n){return Je[n]}function gt(n){return n&&typeof n=="object"?_e.call(n)==T:b}function vt(n,t,e){var r=Te(n),u=r.length;for(t=Y(t,e,3);u--&&(e=r[u],!(t(n[e],e,n)===false)););return n}function ht(n){var t=[];return Xe(n,function(n,e){mt(n)&&t.push(e)}),t.sort()}function yt(n){for(var t=-1,e=Te(n),r=e.length,u={};++t<r;){var o=e[t];u[n[o]]=o}return u}function mt(n){return typeof n=="function"}function dt(n){return!(!n||!X[typeof n])}function bt(n){return typeof n=="number"||_e.call(n)==M
}function _t(n){return typeof n=="string"||_e.call(n)==V}function jt(n){for(var t=-1,e=Te(n),r=e.length,u=Ht(r);++t<r;)u[t]=n[e[t]];return u}function wt(n,t,e){var r=-1,u=lt(),o=n?n.length:0,a=b;return e=(0>e?Se(0,o+e):e)||0,o&&typeof o=="number"?a=-1<(_t(n)?n.indexOf(t,e):u(n,t,e)):Ue(n,function(n){return++r<e?void 0:!(a=n===t)}),a}function kt(n,t,e){var r=m;if(t=_.createCallback(t,e,3),ze(n)){e=-1;for(var u=n.length;++e<u&&(r=!!t(n[e],e,n)););}else Ue(n,function(n,e,u){return r=!!t(n,e,u)});return r
}function xt(n,t,e){var r=[];if(t=_.createCallback(t,e,3),ze(n)){e=-1;for(var u=n.length;++e<u;){var o=n[e];t(o,e,n)&&r.push(o)}}else Ue(n,function(n,e,u){t(n,e,u)&&r.push(n)});return r}function Ct(n,t,e){if(t=_.createCallback(t,e,3),!ze(n)){var r;return Ue(n,function(n,e,u){return t(n,e,u)?(r=n,b):void 0}),r}e=-1;for(var u=n.length;++e<u;){var o=n[e];if(t(o,e,n))return o}}function Et(n,t,e){if(t&&typeof e=="undefined"&&ze(n)){e=-1;for(var r=n.length;++e<r&&t(n[e],e,n)!==false;);}else Ue(n,t,e);return n
}function Ot(n,t,e){var r=n,u=n?n.length:0;if(typeof u!="number")var o=Te(n),u=o.length;else $e.unindexedChars&&_t(n)&&(r=n.split(""));return t=Y(t,e,3),Et(n,function(n,e,a){e=o?o[--u]:--u,t(r[e],e,a)}),n}function St(n,t,e){var r=-1,u=n?n.length:0,o=Ht(typeof u=="number"?u:0);if(t=_.createCallback(t,e,3),ze(n))for(;++r<u;)o[r]=t(n[r],r,n);else Ue(n,function(n,e,u){o[++r]=t(n,e,u)});return o}function At(n,t,e){var r=-1/0,o=r;if(!t&&ze(n)){e=-1;for(var a=n.length;++e<a;){var i=n[e];i>o&&(o=i)}}else t=!t&&_t(n)?u:_.createCallback(t,e,3),Ue(n,function(n,e,u){e=t(n,e,u),e>r&&(r=e,o=n)
});return o}function It(n,t,e,r){var u=3>arguments.length;if(t=Y(t,r,4),ze(n)){var o=-1,a=n.length;for(u&&(e=n[++o]);++o<a;)e=t(e,n[o],o,n)}else Ue(n,function(n,r,o){e=u?(u=b,n):t(e,n,r,o)});return e}function Bt(n,t,e,r){var u=3>arguments.length;return t=Y(t,r,4),Ot(n,function(n,r,o){e=u?(u=b,n):t(e,n,r,o)}),e}function Pt(n,t,e){var r;if(t=_.createCallback(t,e,3),ze(n)){e=-1;for(var u=n.length;++e<u&&!(r=t(n[e],e,n)););}else Ue(n,function(n,e,u){return!(r=t(n,e,u))});return!!r}function Nt(n){var r=-1,u=lt(),o=n?n.length:0,i=Z(arguments,m,m,1),f=[],c=o>=E&&u===t;
if(c){var l=a(i);l?(u=e,i=l):c=b}for(;++r<o;)l=n[r],0>u(i,l)&&f.push(l);return c&&g(i),f}function Ft(n,t,e){if(n){var r=0,u=n.length;if(typeof t!="number"&&t!=d){var o=-1;for(t=_.createCallback(t,e,3);++o<u&&t(n[o],o,n);)r++}else if(r=t,r==d||e)return n[0];return v(n,0,Ae(Se(0,r),u))}}function Rt(n,e,r){if(typeof r=="number"){var u=n?n.length:0;r=0>r?Se(0,u+r):r||0}else if(r)return r=$t(n,e),n[r]===e?r:-1;return n?t(n,e,r):-1}function Dt(n,t,e){if(typeof t!="number"&&t!=d){var r=0,u=-1,o=n?n.length:0;
for(t=_.createCallback(t,e,3);++u<o&&t(n[u],u,n);)r++}else r=t==d||e?1:Se(0,t);return v(n,r)}function $t(n,t,e,r){var u=0,o=n?n.length:u;for(e=e?_.createCallback(e,r,1):Gt,t=e(t);u<o;)r=u+o>>>1,e(n[r])<t?u=r+1:o=r;return u}function zt(n,t,e,r){return typeof t!="boolean"&&t!=d&&(r=e,e=r&&r[t]===n?y:t,t=b),e!=d&&(e=_.createCallback(e,r,3)),ut(n,t,e)}function Lt(){for(var n=1<arguments.length?arguments:arguments[0],t=-1,e=n?At(rr(n,"length")):0,r=Ht(0>e?0:e);++t<e;)r[t]=rr(n,t);return r}function Tt(n,t){for(var e=-1,r=n?n.length:0,u={};++e<r;){var o=n[e];
t?u[o]=t[e]:o&&(u[o[0]]=o[1])}return u}function qt(n,t){return at(n,t,Pe.call(arguments,2),[])}function Kt(n,t,e){function r(){le(s),le(g),c=0,s=g=d}function u(){var t=v&&(!h||1<c);r(),t&&(p!==false&&(l=new Vt),i=n.apply(f,a))}function o(){r(),(v||p!==t)&&(l=new Vt,i=n.apply(f,a))}var a,i,f,c=0,l=0,p=b,s=d,g=d,v=m;if(t=Se(0,t||0),e===m)var h=m,v=b;else dt(e)&&(h=e.leading,p="maxWait"in e&&Se(t,e.maxWait||0),v="trailing"in e?e.trailing:v);return function(){if(a=arguments,f=this,c++,le(g),p===false)h&&2>c&&(i=n.apply(f,a));
else{var e=new Vt;!s&&!h&&(l=e);var r=p-(e-l);0<r?s||(s=de(o,r)):(le(s),s=d,l=e,i=n.apply(f,a))}return t!==p&&(g=de(u,t)),i}}function Wt(n){var t=Pe.call(arguments,1);return de(function(){n.apply(y,t)},1)}function Gt(n){return n}function Jt(n,t){var e=n,r=!t||mt(e);t||(e=j,t=n,n=_),Et(ht(t),function(u){var o=n[u]=t[u];r&&(e.prototype[u]=function(){var t=this.__wrapped__,r=[t];return he.apply(r,arguments),r=o.apply(n,r),t&&typeof t=="object"&&t===r?this:new e(r)})})}function Mt(){return this.__wrapped__
}r=r?et.defaults(n.Object(),r,et.pick(n,z)):n;var Ht=r.Array,Ut=r.Boolean,Vt=r.Date,Qt=r.Function,Xt=r.Math,Yt=r.Number,Zt=r.Object,ne=r.RegExp,te=r.String,ee=r.TypeError,re=[],ue=r.Error.prototype,oe=Zt.prototype,ae=te.prototype,ie=r._,fe=ne("^"+te(oe.valueOf).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/valueOf|for [^\]]+/g,".+?")+"$"),ce=Xt.ceil,le=r.clearTimeout,pe=fe.test(pe=Zt.defineProperty)&&pe,se=Xt.floor,ge=fe.test(ge=Zt.getPrototypeOf)&&ge,ve=oe.hasOwnProperty,he=re.push,ye=oe.propertyIsEnumerable,me=r.setImmediate,de=r.setTimeout,be=re.splice,_e=oe.toString,je=re.unshift,we=fe.test(we=_e.bind)&&we,ke=fe.test(ke=Zt.create)&&ke,xe=fe.test(xe=Ht.isArray)&&xe,Ce=r.isFinite,Ee=r.isNaN,Oe=fe.test(Oe=Zt.keys)&&Oe,Se=Xt.max,Ae=Xt.min,Ie=r.parseInt,Be=Xt.random,Pe=re.slice,Ne=fe.test(r.attachEvent),Fe=we&&!/\n|true/.test(we+Ne),Re={};
}function Ot(n,t,e){var r=n,u=n?n.length:0;if(typeof u!="number")var o=Te(n),u=o.length;else $e.unindexedChars&&_t(n)&&(r=n.split(""));return t=Y(t,e,3),Et(n,function(n,e,a){return e=o?o[--u]:--u,t(r[e],e,a)}),n}function St(n,t,e){var r=-1,u=n?n.length:0,o=Ht(typeof u=="number"?u:0);if(t=_.createCallback(t,e,3),ze(n))for(;++r<u;)o[r]=t(n[r],r,n);else Ue(n,function(n,e,u){o[++r]=t(n,e,u)});return o}function At(n,t,e){var r=-1/0,o=r;if(!t&&ze(n)){e=-1;for(var a=n.length;++e<a;){var i=n[e];i>o&&(o=i)
}}else t=!t&&_t(n)?u:_.createCallback(t,e,3),Ue(n,function(n,e,u){e=t(n,e,u),e>r&&(r=e,o=n)});return o}function It(n,t,e,r){var u=3>arguments.length;if(t=Y(t,r,4),ze(n)){var o=-1,a=n.length;for(u&&(e=n[++o]);++o<a;)e=t(e,n[o],o,n)}else Ue(n,function(n,r,o){e=u?(u=b,n):t(e,n,r,o)});return e}function Bt(n,t,e,r){var u=3>arguments.length;return t=Y(t,r,4),Ot(n,function(n,r,o){e=u?(u=b,n):t(e,n,r,o)}),e}function Pt(n,t,e){var r;if(t=_.createCallback(t,e,3),ze(n)){e=-1;for(var u=n.length;++e<u&&!(r=t(n[e],e,n)););}else Ue(n,function(n,e,u){return!(r=t(n,e,u))
});return!!r}function Nt(n){var r=-1,u=lt(),o=n?n.length:0,i=Z(arguments,m,m,1),f=[],c=o>=E&&u===t;if(c){var l=a(i);l?(u=e,i=l):c=b}for(;++r<o;)l=n[r],0>u(i,l)&&f.push(l);return c&&g(i),f}function Ft(n,t,e){if(n){var r=0,u=n.length;if(typeof t!="number"&&t!=d){var o=-1;for(t=_.createCallback(t,e,3);++o<u&&t(n[o],o,n);)r++}else if(r=t,r==d||e)return n[0];return v(n,0,Ae(Se(0,r),u))}}function Rt(n,e,r){if(typeof r=="number"){var u=n?n.length:0;r=0>r?Se(0,u+r):r||0}else if(r)return r=$t(n,e),n[r]===e?r:-1;
return n?t(n,e,r):-1}function Dt(n,t,e){if(typeof t!="number"&&t!=d){var r=0,u=-1,o=n?n.length:0;for(t=_.createCallback(t,e,3);++u<o&&t(n[u],u,n);)r++}else r=t==d||e?1:Se(0,t);return v(n,r)}function $t(n,t,e,r){var u=0,o=n?n.length:u;for(e=e?_.createCallback(e,r,1):Gt,t=e(t);u<o;)r=u+o>>>1,e(n[r])<t?u=r+1:o=r;return u}function zt(n,t,e,r){return typeof t!="boolean"&&t!=d&&(r=e,e=r&&r[t]===n?y:t,t=b),e!=d&&(e=_.createCallback(e,r,3)),ut(n,t,e)}function Lt(){for(var n=1<arguments.length?arguments:arguments[0],t=-1,e=n?At(rr(n,"length")):0,r=Ht(0>e?0:e);++t<e;)r[t]=rr(n,t);
return r}function Tt(n,t){for(var e=-1,r=n?n.length:0,u={};++e<r;){var o=n[e];t?u[o]=t[e]:o&&(u[o[0]]=o[1])}return u}function qt(n,t){return at(n,t,Pe.call(arguments,2),[])}function Kt(n,t,e){function r(){le(s),le(g),c=0,s=g=d}function u(){var t=v&&(!h||1<c);r(),t&&(p!==false&&(l=new Vt),i=n.apply(f,a))}function o(){r(),(v||p!==t)&&(l=new Vt,i=n.apply(f,a))}var a,i,f,c=0,l=0,p=b,s=d,g=d,v=m;if(t=Se(0,t||0),e===m)var h=m,v=b;else dt(e)&&(h=e.leading,p="maxWait"in e&&Se(t,e.maxWait||0),v="trailing"in e?e.trailing:v);
return function(){if(a=arguments,f=this,c++,le(g),p===false)h&&2>c&&(i=n.apply(f,a));else{var e=new Vt;!s&&!h&&(l=e);var r=p-(e-l);0<r?s||(s=de(o,r)):(le(s),s=d,l=e,i=n.apply(f,a))}return t!==p&&(g=de(u,t)),i}}function Wt(n){var t=Pe.call(arguments,1);return de(function(){n.apply(y,t)},1)}function Gt(n){return n}function Jt(n,t){var e=n,r=!t||mt(e);t||(e=j,t=n,n=_),Et(ht(t),function(u){var o=n[u]=t[u];r&&(e.prototype[u]=function(){var t=this.__wrapped__,r=[t];return he.apply(r,arguments),r=o.apply(n,r),t&&typeof t=="object"&&t===r?this:new e(r)
})})}function Mt(){return this.__wrapped__}r=r?et.defaults(n.Object(),r,et.pick(n,z)):n;var Ht=r.Array,Ut=r.Boolean,Vt=r.Date,Qt=r.Function,Xt=r.Math,Yt=r.Number,Zt=r.Object,ne=r.RegExp,te=r.String,ee=r.TypeError,re=[],ue=r.Error.prototype,oe=Zt.prototype,ae=te.prototype,ie=r._,fe=ne("^"+te(oe.valueOf).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/valueOf|for [^\]]+/g,".+?")+"$"),ce=Xt.ceil,le=r.clearTimeout,pe=fe.test(pe=Zt.defineProperty)&&pe,se=Xt.floor,ge=fe.test(ge=Zt.getPrototypeOf)&&ge,ve=oe.hasOwnProperty,he=re.push,ye=oe.propertyIsEnumerable,me=r.setImmediate,de=r.setTimeout,be=re.splice,_e=oe.toString,je=re.unshift,we=fe.test(we=_e.bind)&&we,ke=fe.test(ke=Zt.create)&&ke,xe=fe.test(xe=Ht.isArray)&&xe,Ce=r.isFinite,Ee=r.isNaN,Oe=fe.test(Oe=Zt.keys)&&Oe,Se=Xt.max,Ae=Xt.min,Ie=r.parseInt,Be=Xt.random,Pe=re.slice,Ne=fe.test(r.attachEvent),Fe=we&&!/\n|true/.test(we+Ne),Re={};
Re[q]=Ht,Re[K]=Ut,Re[W]=Vt,Re[J]=Qt,Re[H]=Zt,Re[M]=Yt,Re[U]=ne,Re[V]=te;var De={};De[q]=De[W]=De[M]={constructor:m,toLocaleString:m,toString:m,valueOf:m},De[K]=De[V]={constructor:m,toString:m,valueOf:m},De[G]=De[J]=De[U]={constructor:m,toString:m},De[H]={constructor:m},function(){for(var n=L.length;n--;){var t,e=L[n];for(t in De)ve.call(De,t)&&!ve.call(De[t],e)&&(De[t][e]=b)}}(),j.prototype=_.prototype;var $e=_.support={};!function(){function n(){this.x=1}var t={0:1,length:1},e=[];n.prototype={valueOf:1};
for(var r in new n)e.push(r);for(r in arguments);$e.argsObject=arguments.constructor==Zt&&!(arguments instanceof Ht),$e.argsClass=_e.call(arguments)==T,$e.enumErrorProps=ye.call(ue,"message")||ye.call(ue,"name"),$e.enumPrototypes=ye.call(n,"prototype"),$e.fastBind=we&&!Fe,$e.ownLast="x"!=e[0],$e.nonEnumArgs=0!=r,$e.nonEnumShadows=!/valueOf/.test(e),$e.spliceObjects=(re.splice.call(t,0,1),!t[0]),$e.unindexedChars="xx"!="x"[0]+Zt("x")[0];try{$e.nodeClass=!(_e.call(document)==H&&!({toString:0}+""))}catch(u){$e.nodeClass=m
}}(1),_.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:F,variable:"",imports:{_:_}},ke||(ft=function(n){if(dt(n)){p.prototype=n;var t=new p;p.prototype=d}return t||{}}),$e.argsClass||(gt=function(n){return n&&typeof n=="object"?ve.call(n,"callee"):b});var ze=xe||function(n){return n&&typeof n=="object"?_e.call(n)==q:b},Le=it({a:"z",e:"[]",i:"if(!(B[typeof z]))return E",g:"E.push(n)"}),Te=Oe?function(n){return dt(n)?$e.enumPrototypes&&typeof n=="function"||$e.nonEnumArgs&&n.length&&gt(n)?Le(n):Oe(n):[]
@@ -32,7 +32,7 @@ for(var r in new n)e.push(r);for(r in arguments);$e.argsObject=arguments.constru
mt(/x/)&&(mt=function(n){return typeof n=="function"&&_e.call(n)==J});var Ze=ge?function(n){if(!n||_e.call(n)!=H||!$e.argsClass&&gt(n))return b;var t=n.valueOf,e=typeof t=="function"&&(e=ge(t))&&ge(e);return e?n==e||ge(n)==e:pt(n)}:pt,nr=ot(function(n,t,e){ve.call(n,e)?n[e]++:n[e]=1}),tr=ot(function(n,t,e){(ve.call(n,e)?n[e]:n[e]=[]).push(t)}),er=ot(function(n,t,e){n[e]=t}),rr=St;Fe&&nt&&typeof me=="function"&&(Wt=qt(me,r));var ur=8==Ie(S+"08")?Ie:function(n,t){return Ie(_t(n)?n.replace(R,""):n,t||0)
};return _.after=function(n,t){return function(){return 1>--n?t.apply(this,arguments):void 0}},_.assign=Ve,_.at=function(n){var t=-1,e=Z(arguments,m,b,1),r=e.length,u=Ht(r);for($e.unindexedChars&&_t(n)&&(n=n.split(""));++t<r;)u[t]=n[e[t]];return u},_.bind=qt,_.bindAll=function(n){for(var t=1<arguments.length?Z(arguments,m,b,1):ht(n),e=-1,r=t.length;++e<r;){var u=t[e];n[u]=qt(n[u],n)}return n},_.bindKey=function(n,t){return at(n,t,Pe.call(arguments,2),[],b,m)},_.chain=function(n){return n=new j(n),n.__chain__=m,n
},_.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},_.compose=function(){var n=arguments;return function(){for(var t=arguments,e=n.length;e--;)t=[n[e].apply(this,t)];return t[0]}},_.countBy=nr,_.createCallback=function(n,t,e){var r=typeof n;if(n==d||"function"==r)return Y(n,t,e);if("object"!=r)return function(t){return t[n]};var u=Te(n),o=u[0],a=n[o];return 1!=u.length||a!==a||dt(a)?function(t){for(var e=u.length,r=b;e--&&(r=tt(t[u[e]],n[u[e]],d,m)););return r
}:function(n){return n=n[o],a===n&&(0!==a||1/a==1/n)}},_.debounce=Kt,_.defaults=Qe,_.defer=Wt,_.delay=function(n,t){var e=Pe.call(arguments,2);return de(function(){n.apply(y,e)},t)},_.difference=Nt,_.filter=xt,_.flatten=function(n,t,e,r){return typeof t!="boolean"&&t!=d&&(r=e,e=r&&r[t]===n?y:t,t=b),e!=d&&(n=St(n,e,r)),Z(n,t)},_.forEach=Et,_.forEachRight=Ot,_.forIn=Xe,_.forInRight=function(n,t,e){var r=-1,u=[];Xe(n,function(n,t){u.push(n,t)});var o=u.length;for(t=Y(t,e,3);++r<o&&t(u[r],u[++r],n)!==false;);return n
}:function(n){return n=n[o],a===n&&(0!==a||1/a==1/n)}},_.debounce=Kt,_.defaults=Qe,_.defer=Wt,_.delay=function(n,t){var e=Pe.call(arguments,2);return de(function(){n.apply(y,e)},t)},_.difference=Nt,_.filter=xt,_.flatten=function(n,t,e,r){return typeof t!="boolean"&&t!=d&&(r=e,e=r&&r[t]===n?y:t,t=b),e!=d&&(n=St(n,e,r)),Z(n,t)},_.forEach=Et,_.forEachRight=Ot,_.forIn=Xe,_.forInRight=function(n,t,e){var r=[];Xe(n,function(n,t){r.push(t,n)});var u=r.length;for(t=Y(t,e,3);u--&&t(r[u--],r[u],n)!==false;);return n
},_.forOwn=Ye,_.forOwnRight=vt,_.functions=ht,_.groupBy=tr,_.indexBy=er,_.initial=function(n,t,e){if(!n)return[];var r=0,u=n.length;if(typeof t!="number"&&t!=d){var o=u;for(t=_.createCallback(t,e,3);o--&&t(n[o],o,n);)r++}else r=t==d||e?1:t||r;return v(n,0,Ae(Se(0,u-r),u))},_.intersection=function(n){for(var r=arguments,u=r.length,o=-1,i=f(),c=-1,l=lt(),p=n?n.length:0,v=[],h=f();++o<u;){var y=r[o];i[o]=l===t&&(y?y.length:0)>=E&&a(o?r[o]:h)}n:for(;++c<p;){var m=i[0],y=n[c];if(0>(m?e(m,y):l(h,y))){for(o=u,(m||h).push(y);--o;)if(m=i[o],0>(m?e(m,y):l(r[o],y)))continue n;
v.push(y)}}for(;u--;)(m=i[u])&&g(m);return s(i),s(h),v},_.invert=yt,_.invoke=function(n,t){var e=Pe.call(arguments,2),r=-1,u=typeof t=="function",o=n?n.length:0,a=Ht(typeof o=="number"?o:0);return Et(n,function(n){a[++r]=(u?t:n[t]).apply(n,e)}),a},_.keys=Te,_.map=St,_.max=At,_.memoize=function(n,t){function e(){var r=e.cache,u=C+(t?t.apply(this,arguments):arguments[0]);return ve.call(r,u)?r[u]:r[u]=n.apply(this,arguments)}return e.cache={},e},_.merge=function(n){var t=arguments,e=2;if(!dt(n))return n;
if("number"!=typeof t[2]&&(e=t.length),3<e&&"function"==typeof t[e-2])var r=Y(t[--e-1],t[e--],2);else 2<e&&"function"==typeof t[e-1]&&(r=t[--e]);for(var t=Pe.call(arguments,1,e),u=-1,o=f(),a=f();++u<e;)rt(n,t[u],r,o,a);return s(o),s(a),n},_.min=function(n,t,e){var r=1/0,o=r;if(!t&&ze(n)){e=-1;for(var a=n.length;++e<a;){var i=n[e];i<o&&(o=i)}}else t=!t&&_t(n)?u:_.createCallback(t,e,3),Ue(n,function(n,e,u){e=t(n,e,u),e<r&&(r=e,o=n)});return o},_.omit=function(n,t,e){var r=lt(),u=typeof t=="function",o={};
@@ -41,8 +41,8 @@ i in n&&(r[i]=n[i])}else t=_.createCallback(t,e,3),Xe(n,function(n,e,u){t(n,e,u)
})},_.remove=function(n,t,e){var r=[];if(t=_.createCallback(t,e,3),ze(n)){e=-1;for(var u=n.length;++e<u;){var o=n[e];t(o,e,n)&&(r.push(o),be.call(n,e--,1),u--)}}else Ue(n,function(n,e,u){t(n,e,u)&&(r.push(n),delete u[e])});return r},_.rest=Dt,_.shuffle=function(n){var t=-1,e=n?n.length:0,r=Ht(typeof e=="number"?e:0);return Et(n,function(n){var e=se(Be()*(++t+1));r[t]=r[e],r[e]=n}),r},_.sortBy=function(n,t,e){var r=-1,u=n?n.length:0,a=Ht(typeof u=="number"?u:0);for(t=_.createCallback(t,e,3),Et(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,g(n);return a},_.tap=function(n,t){return t(n),n},_.throttle=function(n,t,e){var r=m,u=m;return e===false?r=b:dt(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=Kt(n,t,e),g(e),n},_.times=function(n,t,e){n=-1<(n=+n)?n:0;var r=-1,u=Ht(n);for(t=Y(t,e,1);++r<n;)u[r]=t(r);return u},_.toArray=function(n){return n&&typeof n.length=="number"?$e.unindexedChars&&_t(n)?n.split(""):v(n):jt(n)
},_.transform=function(n,t,e,r){var u=ze(n);return t=Y(t,r,4),e==d&&(u?e=[]:(r=n&&n.constructor,e=ft(r&&r.prototype))),(u?Ue:Ye)(n,function(n,r,u){return t(e,n,r,u)}),e},_.union=function(){return ut(Z(arguments,m,m))},_.uniq=zt,_.values=jt,_.where=xt,_.without=function(n){return Nt(n,Pe.call(arguments,1))},_.wrap=function(n,t){return function(){var e=[n];return he.apply(e,arguments),t.apply(this,e)}},_.zip=Lt,_.zipObject=Tt,_.collect=St,_.drop=Dt,_.each=Et,_.extend=Ve,_.methods=ht,_.object=Tt,_.select=xt,_.tail=Dt,_.unique=zt,_.unzip=Lt,Jt(_),_.clone=function(n,t,e,r){return typeof t!="boolean"&&t!=d&&(r=e,e=t,t=b),O(n,t,typeof e=="function"&&Y(e,r,1))
},_.cloneDeep=function(n,t,e){return O(n,m,typeof t=="function"&&Y(t,e,1))},_.contains=wt,_.escape=function(n){return n==d?"":te(n).replace(He,ct)},_.every=kt,_.find=Ct,_.findIndex=function(n,t,e){var r=-1,u=n?n.length:0;for(t=_.createCallback(t,e,3);++r<u;)if(t(n[r],r,n))return r;return-1},_.findLast=function(n,t,e){var r;return t=_.createCallback(t,e),Ot(n,function(n,e,u){return t(n,e,u)?(r=n,b):void 0}),r},_.findLastIndex=function(n,t,e){var r=n?n.length:0;for(t=_.createCallback(t,e);r--&&!t(n[-1],-1,n););return-1
},_.findKey=function(n,t,e){var r;return t=_.createCallback(t,e,3),Ye(n,function(n,e,u){return t(n,e,u)?(r=e,b):void 0}),r},_.findLastKey=function(n,t,e){var r;return t=_.createCallback(t,e),vt(n,function(n,e,u){return t(n,e,u)?(r=e,b):void 0}),r},_.has=function(n,t){return n?ve.call(n,t):b},_.identity=Gt,_.indexOf=Rt,_.isArguments=gt,_.isArray=ze,_.isBoolean=function(n){return n===m||n===false||_e.call(n)==K},_.isDate=function(n){return n?typeof n=="object"&&_e.call(n)==W:b},_.isElement=function(n){return n?1===n.nodeType:b
},_.cloneDeep=function(n,t,e){return O(n,m,typeof t=="function"&&Y(t,e,1))},_.contains=wt,_.escape=function(n){return n==d?"":te(n).replace(He,ct)},_.every=kt,_.find=Ct,_.findIndex=function(n,t,e){var r=-1,u=n?n.length:0;for(t=_.createCallback(t,e,3);++r<u;)if(t(n[r],r,n))return r;return-1},_.findLast=function(n,t,e){var r;return t=_.createCallback(t,e,3),Ot(n,function(n,e,u){return t(n,e,u)?(r=n,b):void 0}),r},_.findLastIndex=function(n,t,e){var r=n?n.length:0;for(t=_.createCallback(t,e,3);r--;)if(t(n[r],r,n))return r;
return-1},_.findKey=function(n,t,e){var r;return t=_.createCallback(t,e,3),Ye(n,function(n,e,u){return t(n,e,u)?(r=e,b):void 0}),r},_.findLastKey=function(n,t,e){var r;return t=_.createCallback(t,e,3),vt(n,function(n,e,u){return t(n,e,u)?(r=e,b):void 0}),r},_.has=function(n,t){return n?ve.call(n,t):b},_.identity=Gt,_.indexOf=Rt,_.isArguments=gt,_.isArray=ze,_.isBoolean=function(n){return n===m||n===false||_e.call(n)==K},_.isDate=function(n){return n?typeof n=="object"&&_e.call(n)==W:b},_.isElement=function(n){return n?1===n.nodeType:b
},_.isEmpty=function(n){var t=m;if(!n)return t;var e=_e.call(n),r=n.length;return e==q||e==V||($e.argsClass?e==T:gt(n))||e==H&&typeof r=="number"&&mt(n.splice)?!r:(Ye(n,function(){return t=b}),t)},_.isEqual=function(n,t,e,r){return tt(n,t,typeof e=="function"&&Y(e,r,2))},_.isFinite=function(n){return Ce(n)&&!Ee(parseFloat(n))},_.isFunction=mt,_.isNaN=function(n){return bt(n)&&n!=+n},_.isNull=function(n){return n===d},_.isNumber=bt,_.isObject=dt,_.isPlainObject=Ze,_.isRegExp=function(n){return n&&X[typeof n]?_e.call(n)==U:b
},_.isString=_t,_.isUndefined=function(n){return typeof n=="undefined"},_.lastIndexOf=function(n,t,e){var r=n?n.length:0;for(typeof e=="number"&&(r=(0>e?Se(0,r+e):Ae(e,r-1))+1);r--;)if(n[r]===t)return r;return-1},_.mixin=Jt,_.noConflict=function(){return r._=ie,this},_.parseInt=ur,_.random=function(n,t){n==d&&t==d&&(t=1),n=+n||0,t==d?(t=n,n=0):t=+t||0;var e=Be();return n%1||t%1?n+Ae(e*(t-n+parseFloat("1e-"+((e+"").length-1))),t):n+se(e*(t-n+1))},_.reduce=It,_.reduceRight=Bt,_.result=function(n,t){var e=n?n[t]:y;
return mt(e)?n[t]():e},_.runInContext=h,_.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:Te(n).length},_.some=Pt,_.sortedIndex=$t,_.template=function(n,t,e){var r=_.templateSettings;n||(n=""),e=Qe({},e,r);var u,o=Qe({},e.imports,r.imports),r=Te(o),o=jt(o),a=0,f=e.interpolate||D,c="__p+='",f=ne((e.escape||D).source+"|"+f.source+"|"+(f===F?P:D).source+"|"+(e.evaluate||D).source+"|$","g");n.replace(f,function(t,e,r,o,f,l){return r||(r=o),c+=n.slice(a,l).replace($,i),e&&(c+="'+__e("+e+")+'"),f&&(u=m,c+="';"+f+";__p+='"),r&&(c+="'+((__t=("+r+"))==null?'':__t)+'"),a=l+t.length,t