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

@@ -11,7 +11,7 @@ if(i!=ht)return ut;var i=n.constructor,a=t.constructor;if(i!=a&&(!E(i)||!(i inst
}return o}function y(n){return T(n)?Dt(n):{}}function m(n){return Kt[n]}function _(){var n=(n=f.indexOf)===H?u:n;return n}function d(n){return Lt[n]}function b(n){return n&&typeof n=="object"?Rt.call(n)==lt:ut}function j(n){if(!n)return n;for(var t=1,r=arguments.length;t<r;t++){var e=arguments[t];if(e)for(var u in e)n[u]=e[u]}return n}function w(n){if(!n)return n;for(var t=1,r=arguments.length;t<r;t++){var e=arguments[t];if(e)for(var u in e)"undefined"==typeof n[u]&&(n[u]=e[u])}return n}function x(n){var t=[];
return r(n,function(n,r){E(n)&&t.push(r)}),t.sort()}function A(n){for(var t=-1,r=Jt(n),e=r.length,u={};++t<e;){var i=r[t];u[n[i]]=i}return u}function O(n){if(!n)return rt;if(Ht(n)||F(n))return!n.length;for(var t in n)if(Ft.call(n,t))return ut;return rt}function E(n){return typeof n=="function"}function T(n){return!(!n||!_t[typeof n])}function S(n){return typeof n=="number"||Rt.call(n)==gt}function F(n){return typeof n=="string"||Rt.call(n)==mt}function N(n){for(var t=-1,r=Jt(n),e=r.length,u=Array(e);++t<e;)u[t]=n[r[t]];
return u}function R(n,r){var e=_(),u=n?n.length:0,i=ut;return u&&typeof u=="number"?i=-1<e(n,r):t(n,function(n){return(i=n===r)&&ot}),i}function k(n,r,e){var u=rt;r=X(r,e,3),e=-1;var i=n?n.length:0;if(typeof i=="number")for(;++e<i&&(u=!!r(n[e],e,n)););else t(n,function(n,t,e){return!(u=!!r(n,t,e))&&ot});return u}function B(n,r,e){var u=[];r=X(r,e,3),e=-1;var i=n?n.length:0;if(typeof i=="number")for(;++e<i;){var o=n[e];r(o,e,n)&&u.push(o)}else t(n,function(n,t,e){r(n,t,e)&&u.push(n)});return u}function D(n,r,e){r=X(r,e,3),e=-1;
var u=n?n.length:0;if(typeof u!="number"){var i;return t(n,function(n,t,e){return r(n,t,e)?(i=n,ot):void 0}),i}for(;++e<u;){var o=n[e];if(r(o,e,n))return o}}function q(n,r,e){var u=-1,i=n?n.length:0;if(r=r&&typeof e=="undefined"?r:l(r,e,3),typeof i=="number")for(;++u<i&&r(n[u],u,n)!==ot;);else t(n,r)}function M(n,t){var r=n?n.length:0;if(typeof r!="number")var e=Jt(n),r=e.length;t=l(t,void 0,3),q(n,function(u,i,o){i=e?e[--r]:--r,t(n[i],i,o)})}function $(n,r,e){var u=-1,i=n?n.length:0;if(r=X(r,e,3),typeof i=="number")for(var o=Array(i);++u<i;)o[u]=r(n[u],u,n);
var u=n?n.length:0;if(typeof u!="number"){var i;return t(n,function(n,t,e){return r(n,t,e)?(i=n,ot):void 0}),i}for(;++e<u;){var o=n[e];if(r(o,e,n))return o}}function q(n,r,e){var u=-1,i=n?n.length:0;if(r=r&&typeof e=="undefined"?r:l(r,e,3),typeof i=="number")for(;++u<i&&r(n[u],u,n)!==ot;);else t(n,r)}function M(n,t){var r=n?n.length:0;if(typeof r!="number")var e=Jt(n),r=e.length;q(n,function(u,i,o){return i=e?e[--r]:--r,t(n[i],i,o)===ut&&ot})}function $(n,r,e){var u=-1,i=n?n.length:0;if(r=X(r,e,3),typeof i=="number")for(var o=Array(i);++u<i;)o[u]=r(n[u],u,n);
else o=[],t(n,function(n,t,e){o[++u]=r(n,t,e)});return o}function I(n,t,r){var e=-1/0,u=e,i=-1,o=n?n.length:0;if(t||typeof o!="number")t=X(t,r,3),q(n,function(n,r,i){r=t(n,r,i),r>e&&(e=r,u=n)});else for(;++i<o;)r=n[i],r>u&&(u=r);return u}function W(n,t){var r=-1,e=n?n.length:0;if(typeof e=="number")for(var u=Array(e);++r<e;)u[r]=n[r][t];return u||$(n,t)}function z(n,r,e,u){if(!n)return e;var i=3>arguments.length;r=l(r,u,4);var o=-1,a=n.length;if(typeof a=="number")for(i&&(e=n[++o]);++o<a;)e=r(e,n[o],o,n);
else t(n,function(n,t,u){e=i?(i=ut,n):r(e,n,t,u)});return e}function C(n,t,r,e){var u=3>arguments.length;return t=l(t,e,4),M(n,function(n,e,i){r=u?(u=ut,n):t(r,n,e,i)}),r}function P(n,r,e){var u;r=X(r,e,3),e=-1;var i=n?n.length:0;if(typeof i=="number")for(;++e<i&&!(u=r(n[e],e,n)););else t(n,function(n,t,e){return(u=r(n,t,e))&&ot});return!!u}function U(n,t,r){return r&&O(t)?tt:(r?D:B)(n,t)}function V(n){for(var t=-1,r=_(),e=n.length,u=p(arguments,rt,rt,1),i=[];++t<e;){var o=n[t];0>r(u,o)&&i.push(o)
}return i}function G(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&t!=et){var i=-1;for(t=X(t,r,3);++i<u&&t(n[i],i,n);)e++}else if(e=t,e==et||r)return n[0];return Pt.call(n,0,zt(Wt(0,e),u))}}function H(n,t,r){if(typeof r=="number"){var e=n?n.length:0;r=0>r?Wt(0,e+r):r||0}else if(r)return r=K(n,t),n[r]===t?r:-1;return n?u(n,t,r):-1}function J(n,t,r){if(typeof t!="number"&&t!=et){var e=0,u=-1,i=n?n.length:0;for(t=X(t,r,3);++u<i&&t(n[u],u,n);)e++}else e=t==et||r?1:Wt(0,t);return Pt.call(n,e)
@@ -30,7 +30,7 @@ return r===ut?e=ut:T(r)&&(e="leading"in r?r.leading:e,u="trailing"in r?r.trailin
}},f.zip=function(){for(var n=-1,t=I(W(arguments,"length")),r=Array(0>t?0:t);++n<t;)r[n]=W(arguments,n);return r},f.collect=$,f.drop=J,f.each=q,f.extend=j,f.methods=x,f.object=function(n,t){for(var r=-1,e=n?n.length:0,u={};++r<e;){var i=n[r];t?u[i]=t[r]:i&&(u[i[0]]=i[1])}return u},f.select=B,f.tail=J,f.unique=L,f.clone=function(n){return T(n)?Ht(n)?Pt.call(n):j({},n):n},f.contains=R,f.escape=function(n){return n==et?"":(n+"").replace(Xt,m)},f.every=k,f.find=D,f.has=function(n,t){return n?Ft.call(n,t):ut
},f.identity=Z,f.indexOf=H,f.isArguments=b,f.isArray=Ht,f.isBoolean=function(n){return n===rt||n===ut||Rt.call(n)==st},f.isDate=function(n){return n?typeof n=="object"&&Rt.call(n)==vt:ut},f.isElement=function(n){return n?1===n.nodeType:ut},f.isEmpty=O,f.isEqual=function(n,t){return s(n,t)},f.isFinite=function(n){return Mt(n)&&!$t(parseFloat(n))},f.isFunction=E,f.isNaN=function(n){return S(n)&&n!=+n},f.isNull=function(n){return n===et},f.isNumber=S,f.isObject=T,f.isRegExp=function(n){return n&&_t[typeof n]?Rt.call(n)==yt:ut
},f.isString=F,f.isUndefined=function(n){return typeof n=="undefined"},f.lastIndexOf=function(n,t,r){var e=n?n.length:0;for(typeof r=="number"&&(e=(0>r?Wt(0,e+r):zt(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},f.mixin=nt,f.noConflict=function(){return n._=Ot,this},f.random=function(n,t){n==et&&t==et&&(t=1),n=+n||0,t==et?(t=n,n=0):t=+t||0;var r=Ct();return n%1||t%1?n+zt(r*(t-n+parseFloat("1e-"+((r+"").length-1))),t):n+St(r*(t-n+1))},f.reduce=z,f.reduceRight=C,f.result=function(n,t){var r=n?n[t]:tt;
return E(r)?n[t]():r},f.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:Jt(n).length},f.some=P,f.sortedIndex=K,f.template=function(n,t,r){var e=f.templateSettings;n||(n=""),r=w({},r,e);var u=0,i="__p+='",e=r.variable;n.replace(RegExp((r.escape||ft).source+"|"+(r.interpolate||ft).source+"|"+(r.evaluate||ft).source+"|$","g"),function(t,r,e,a,f){return i+=n.slice(u,f).replace(ct,o),r&&(i+="'+_.escape("+r+")+'"),a&&(i+="';"+a+";__p+='"),e&&(i+="'+((__t=("+e+"))==null?'':__t)+'"),u=f+t.length,t
}),i+="';\n",e||(e="obj",i="with("+e+"||{}){"+i+"}"),i="function("+e+"){var __t,__p='',__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}"+i+"return __p}";try{var a=Function("_","return "+i)(f)}catch(c){throw c.source=i,c}return t?a(t):(a.source=i,a)},f.unescape=function(n){return n==et?"":(n+"").replace(Qt,d)},f.uniqueId=function(n){var t=++it+"";return n?n+t:t},f.all=k,f.any=P,f.detect=D,f.findWhere=function(n,t){return U(n,t,rt)},f.foldl=z,f.foldr=C,f.include=R,f.inject=z,f.first=G,f.last=function(n,t,r){if(n){var e=0,u=n.length;
return E(r)?n[t]():r},f.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:Jt(n).length},f.some=P,f.sortedIndex=K,f.template=function(n,t,r){var e=f,u=e.templateSettings;n||(n=""),r=w({},r,u);var i=0,a="__p+='",u=r.variable;n.replace(RegExp((r.escape||ft).source+"|"+(r.interpolate||ft).source+"|"+(r.evaluate||ft).source+"|$","g"),function(t,r,e,u,f){return a+=n.slice(i,f).replace(ct,o),r&&(a+="'+_.escape("+r+")+'"),u&&(a+="';"+u+";__p+='"),e&&(a+="'+((__t=("+e+"))==null?'':__t)+'"),i=f+t.length,t
}),a+="';\n",u||(u="obj",a="with("+u+"||{}){"+a+"}"),a="function("+u+"){var __t,__p='',__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}"+a+"return __p}";try{var c=Function("_","return "+a)(e)}catch(l){throw l.source=a,l}return t?c(t):(c.source=a,c)},f.unescape=function(n){return n==et?"":(n+"").replace(Qt,d)},f.uniqueId=function(n){var t=++it+"";return n?n+t:t},f.all=k,f.any=P,f.detect=D,f.findWhere=function(n,t){return U(n,t,rt)},f.foldl=z,f.foldr=C,f.include=R,f.inject=z,f.first=G,f.last=function(n,t,r){if(n){var e=0,u=n.length;
if(typeof t!="number"&&t!=et){var i=u;for(t=X(t,r,3);i--&&t(n[i],i,n);)e++}else if(e=t,e==et||r)return n[u-1];return Pt.call(n,Wt(0,u-e))}},f.take=G,f.head=G,nt(f),f.VERSION="1.3.1",f.prototype.chain=function(){return this.__chain__=rt,this},f.prototype.value=function(){return this.__wrapped__},q("pop push reverse shift sort splice unshift".split(" "),function(n){var t=xt[n];f.prototype[n]=function(){var n=this.__wrapped__;return t.apply(n,arguments),!Gt.spliceObjects&&0===n.length&&delete n[0],this
}}),q(["concat","join","slice"],function(n){var t=xt[n];f.prototype[n]=function(){var n=t.apply(this.__wrapped__,arguments);return this.__chain__&&(n=new c(n),n.__chain__=rt),n}}),typeof define=="function"&&typeof define.amd=="object"&&define.amd?(n._=f, define(function(){return f})):bt&&!bt.nodeType?jt?(jt.exports=f)._=f:bt._=f:n._=f}(this);