diff --git a/build.js b/build.js index 2d8f34e24..e5a526ca2 100644 --- a/build.js +++ b/build.js @@ -102,7 +102,7 @@ 'compose': [], 'contains': ['basicEach', 'getIndexOf', 'isString'], 'countBy': ['createCallback', 'forEach'], - 'createCallback': ['identity', 'keys'], + 'createCallback': ['identity', 'isEqual', 'keys'], 'debounce': ['isObject'], 'defaults': ['createCallback', 'createIterator'], 'defer': ['bind'], @@ -205,7 +205,7 @@ 'compareAscending': [], 'createBound': ['createObject', 'isFunction', 'isObject'], 'createCache': ['cachePush', 'getObject', 'releaseObject'], - 'createIterator': ['getObject', 'isArguments', 'isArray', 'isString', 'iteratorTemplate', 'lodash', 'releaseObject'], + 'createIterator': ['getObject', 'isArguments', 'isArray', 'isString', 'keys', 'iteratorTemplate', 'lodash', 'releaseObject'], 'createObject': [ 'isObject', 'noop'], 'escapeHtmlChar': [], 'escapeStringChar': [], @@ -902,7 +902,7 @@ (function() { var deps = _.invoke(categories, 'toLowerCase'), depArgs = deps.join(', '), - depPaths = "['" + (deps.length ? './' + deps.join("', './") : '') + "'], ", + depPaths = "['" + deps.map(function(dep) { return './' + dep; }).join("', '") + "'], ", iife = []; if (isAMD) { @@ -2681,7 +2681,12 @@ } }); } - if (isModularize) { + if (isNoDep) { + // avoid circular dependencies + funcDependencyMap.createCallback = _.without(funcDependencyMap.createCallback, 'isEqual'); + funcDependencyMap.createIterator = _.without(funcDependencyMap.createIterator, 'keys'); + } + else if (isModularize) { _.forOwn(funcDependencyMap, function(deps, funcName) { if (_.contains(deps, 'getIndexOf')) { (deps = funcDependencyMap[funcName] = _.without(deps, 'getIndexOf')).push( 'basicIndexOf'); @@ -2873,8 +2878,8 @@ return result; }()); + // add properties, variables, and their function dependencies to include in the build if (!isNoDep) { - // add properties, variables, and their function dependencies to include in the build (function() { function expand(result, depMap, funcNames, stack) { stack || (stack = []); @@ -3384,7 +3389,7 @@ ' });', ' }', ' return result;', - '}' + '};' ].join('\n')); } // replace `_.memoize` @@ -3682,7 +3687,7 @@ // remove `_.isEqual` use from `createCallback` if (!isLodash('where')) { source = source.replace(matchFunction(source, 'createCallback'), function(match) { - return match.replace(/\bisEqual\(([^,]+), *([^,]+)[^)]+\)/, '$1 === $2'); + return match.replace(/=.+?\bisEqual\((.+?), *(.+?),.+?\)/, '= $1 === $2'); }); } // remove unused features from `createBound` diff --git a/dist/lodash.compat.js b/dist/lodash.compat.js index 5d645d50d..4384096d1 100644 --- a/dist/lodash.compat.js +++ b/dist/lodash.compat.js @@ -22,8 +22,8 @@ /** Used internally to indicate various things */ var indicatorObject = {}; - /** Used to avoid reference errors in `createIterator` */ - var iteratorObject = {}; + /** Used to avoid reference errors and circular dependency errors */ + var dependencyObject = {}; /** Used to prefix keys to avoid issues with `__proto__` and properties on `Object.prototype` */ var keyPrefix = +new Date + ''; @@ -1105,7 +1105,7 @@ */ function createIterator() { var data = getObject(), - keys = iteratorObject.keys; + keys = dependencyObject.keys; // data properties data.shadowedProps = shadowedProps; @@ -1316,7 +1316,7 @@ * _.keys({ 'one': 1, 'two': 2, 'three': 3 }); * // => ['one', 'two', 'three'] (order is not guaranteed) */ - var keys = iteratorObject.keys = !nativeKeys ? shimKeys : function(object) { + var keys = dependencyObject.keys = !nativeKeys ? shimKeys : function(object) { if (!isObject(object)) { return []; } @@ -1898,7 +1898,7 @@ * }); * // => true */ - function isEqual(a, b, callback, thisArg, stackA, stackB) { + var isEqual = dependencyObject.isEqual = function(a, b, callback, thisArg, stackA, stackB) { // used to indicate that when comparing objects, `a` has at least the properties of `b` var whereIndicator = callback === indicatorObject; if (typeof callback == 'function' && !whereIndicator) { @@ -2054,7 +2054,7 @@ releaseArray(stackB); } return result; - } + }; /** * Checks if `value` is, or can be coerced to, a finite number. @@ -4748,7 +4748,7 @@ var length = props.length, result = false; while (length--) { - if (!(result = isEqual(object[props[length]], func[props[length]], indicatorObject))) { + if (!(result = dependencyObject.isEqual(object[props[length]], func[props[length]], indicatorObject))) { break; } } diff --git a/dist/lodash.compat.min.js b/dist/lodash.compat.min.js index 3409bf184..4f2230c2e 100644 --- a/dist/lodash.compat.min.js +++ b/dist/lodash.compat.min.js @@ -5,47 +5,47 @@ */ ;!function(n){function t(n,t,r){r=(r||0)-1;for(var e=n?n.length:0;++rt||typeof n=="undefined")return 1;if(nr?0:r);++e=E&&i===t,v=u||p?f():l;if(p){var h=a(v);h?(i=r,v=h):(p=b,v=u?v:(s(v),l))}for(;++oi(v,m))&&((u||p)&&v.push(m),l.push(h))}return p?(s(v.b),g(v)):u&&s(v),l}function tt(n,t,r,e){function u(){var e=arguments,c=a?this:t;return o||(n=t[i]),r.length&&(e=e.length?(e=Sr.call(e),f?e.concat(r):r.concat(e)):r),this instanceof u?(c=ot(n.prototype),e=n.apply(c,e),mt(e)?e:c):n.apply(c,e) -}var o=ht(n),a=!r,i=t;if(a){var f=e;r=t}else if(!o){if(!e)throw new nr;t=n}return u}function et(){var n=c(),t=x.o;n.g=W,n.b=n.c=n.f=n.h="",n.e="r",n.i=y,n.j=!!t;for(var r,e=0;r=arguments[e];e++)for(var u in r)n[u]=r[u];e=n.a,n.d=/^[^,]+/.exec(e)[0],r=Ut,e="return function("+e+"){",u="var m,r="+n.d+",C="+n.e+";if(!r)return C;"+n.h+";",n.b?(u+="var s=r.length;m=-1;if("+n.b+"){",Pr.unindexedChars&&(u+="if(q(r)){r=r.split('')}"),u+="while(++mk;k++)u+="m='"+n.g[k]+"';if((!(p&&v[m])&&l.call(r,m))",n.i||(u+="||(!v[m]&&r[m]!==y[m])"),u+="){"+n.f+"}"; -u+="}"}return(n.b||Pr.nonEnumArgs)&&(u+="}"),u+=n.c+";return C",r=r("i,j,l,indicatorObject,n,o,q,t,u,y,z,w,G,H,J",e+u+"}"),g(n),r(K,rr,sr,w,lt,Dr,dt,t,_,er,Z,Nr,X,ur,yr)}function ot(n){return mt(n)?br(n):{}}function at(n){return Wr[n]}function it(){var n=(n=_.indexOf)===Pt?t:n;return n}function ft(n){var t,r;return!n||yr.call(n)!=V||(t=n.constructor,ht(t)&&!(t instanceof t))||!Pr.argsClass&<(n)||!Pr.nodeClass&&l(n)?b:Pr.ownLast?(Mr(n,function(n,t,e){return r=sr.call(e,t),b}),r!==false):(Mr(n,function(n,t){r=t -}),r===m||sr.call(n,r))}function ct(n){return Lr[n]}function lt(n){return n&&typeof n=="object"?yr.call(n)==L:b}function pt(n,t,r,e,u,o){var a=n;if(typeof t!="boolean"&&t!=d&&(e=r,r=t,t=b),typeof r=="function"){if(r=typeof e=="undefined"?r:_.createCallback(r,e,1),a=r(a),typeof a!="undefined")return a;a=n}if(e=mt(a)){var i=yr.call(a);if(!Y[i]||!Pr.nodeClass&&l(a))return a;var c=Dr(a)}if(!e||!t)return e?c?v(a):Jr({},a):a;switch(e=Br[i],i){case H:case J:return new e(+a);case U:case X:return new e(a); -case Q:return e(a.source,z.exec(a))}i=!u,u||(u=f()),o||(o=f());for(var p=u.length;p--;)if(u[p]==n)return o[p];return a=c?e(a.length):{},c&&(sr.call(n,"index")&&(a.index=n.index),sr.call(n,"input")&&(a.input=n.input)),u.push(n),o.push(a),(c?Tr:Ur)(n,function(n,e){a[e]=pt(n,t,r,m,u,o)}),i&&(s(u),s(o)),a}function st(n){var t=[];return Mr(n,function(n,r){ht(n)&&t.push(r)}),t.sort()}function gt(n){for(var t=-1,r=qr(n),e=r.length,u={};++tr?kr(0,o+r):r)||0,o&&typeof o=="number"?a=-1<(dt(n)?n.indexOf(t,r):u(n,t,r)):Tr(n,function(n){return++eo&&(o=i)}}else t=!t&&dt(n)?u:_.createCallback(t,r),Tr(n,function(n,r,u){r=t(n,r,u),r>e&&(e=r,o=n)});return o}function St(n,t,r,e){var u=3>arguments.length;if(t=_.createCallback(t,e,4),Dr(n)){var o=-1,a=n.length;for(u&&(r=n[++o]);++oarguments.length;if(typeof o!="number")var i=qr(n),o=i.length;else Pr.unindexedChars&&dt(n)&&(u=n.split(""));return t=_.createCallback(t,e,4),xt(n,function(n,e,f){e=i?i[--o]:--o,r=a?(a=b,u[e]):t(r,u[e],e,f) -}),r}function It(n,t,r){var e;if(t=_.createCallback(t,r),Dr(n)){r=-1;for(var u=n.length;++r=E&&u===t;if(c){var l=a(i);l?(u=r,i=l):c=b}for(;++eu(i,l)&&f.push(l);return c&&g(i),f}function Nt(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&t!=d){var o=-1;for(t=_.createCallback(t,r);++oe?kr(0,u+e):e||0}else if(e)return e=Ft(n,r),n[e]===r?e:-1;return n?t(n,r,e):-1}function zt(n,t,r){if(typeof t!="number"&&t!=d){var e=0,u=-1,o=n?n.length:0;for(t=_.createCallback(t,r);++u>>1,r(n[e])r?0:r);++tc&&(i=n.apply(f,a));else{var r=new Mt;!s&&!h&&(l=r);var e=p-(r-l);0/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:F,variable:"",imports:{_:_}};var zr={a:"x,F,k",h:"var a=arguments,b=0,c=typeof k=='number'?2:a.length;while(++b":">",'"':""","'":"'"},Lr=gt(Wr),Gr=Yt("("+qr(Lr).join("|")+")","g"),Hr=Yt("["+qr(Wr).join("")+"]","g"),Jr=et(zr,{h:zr.h.replace(";",";if(c>3&&typeof a[c-2]=='function'){var d=u.createCallback(a[--c-1],a[c--],2)}else if(c>2&&typeof a[c-1]=='function'){d=a[--c]}"),f:"C[m]=d?d(C[m],r[m]):r[m]"}),Kr=et(zr),Mr=et(Fr,$r,{i:b}),Ur=et(Fr,$r); -ht(/x/)&&(ht=function(n){return typeof n=="function"&&yr.call(n)==M});var Vr=pr?function(n){if(!n||yr.call(n)!=V||!Pr.argsClass&<(n))return b;var t=n.valueOf,r=typeof t=="function"&&(r=pr(t))&&pr(r);return r?n==r||pr(n)==r:ft(n)}:ft,Qr=Ot;Ir&&rt&&typeof hr=="function"&&(Wt=qt(hr,e));var Xr=8==Or(A+"08")?Or:function(n,t){return Or(dt(n)?n.replace($,""):n,t||0)};return _.after=function(n,t){return function(){return 1>--n?t.apply(this,arguments):void 0}},_.assign=Jr,_.at=function(n){var t=-1,r=S(arguments,y,b,1),e=r.length,u=Jt(e); -for(Pr.unindexedChars&&dt(n)&&(n=n.split(""));++t=E&&a(o?e[o]:h)}n:for(;++c(y?r(y,m):l(h,m))){for(o=u,(y||h).push(m);--o;)if(y=i[o],0>(y?r(y,m):l(e[o],m)))continue n; -v.push(m)}}for(;u--;)(y=i[u])&&g(y);return s(i),s(h),v},_.invert=gt,_.invoke=function(n,t){var r=Sr.call(arguments,2),e=-1,u=typeof t=="function",o=n?n.length:0,a=Jt(typeof o=="number"?o:0);return xt(n,function(n){a[++e]=(u?t:n[t]).apply(n,r)}),a},_.keys=qr,_.map=Ot,_.max=Et,_.memoize=function(n,t){function r(){var e=r.cache,u=O+(t?t.apply(this,arguments):arguments[0]);return sr.call(e,u)?e[u]:e[u]=n.apply(this,arguments)}return r.cache={},r},_.merge=bt,_.min=function(n,t,r){var e=1/0,o=e;if(!t&&Dr(n)){r=-1; -for(var a=n.length;++re(a,r))&&(o[r]=n)}),o},_.once=function(n){var t,r;return function(){return t?r:(t=y,r=n.apply(this,arguments),n=d,r)}},_.pairs=function(n){for(var t=-1,r=qr(n),e=r.length,u=Jt(e);++tr?kr(0,e+r):xr(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},_.mixin=Gt,_.noConflict=function(){return e._=or,this},_.parseInt=Xr,_.random=function(n,t){n==d&&t==d&&(t=1),n=+n||0,t==d?(t=n,n=0):t=+t||0;var r=Er();return n%1||t%1?n+xr(r*(t-n+parseFloat("1e-"+((r+"").length-1))),t):n+cr(r*(t-n+1))},_.reduce=St,_.reduceRight=At,_.result=function(n,t){var r=n?n[t]:m;return ht(r)?n[t]():r},_.runInContext=h,_.size=function(n){var t=n?n.length:0; -return typeof t=="number"?t:qr(n).length},_.some=It,_.sortedIndex=Ft,_.template=function(n,t,r){var e=_.templateSettings;n||(n=""),r=Kr({},r,e);var u,o=Kr({},r.imports,e.imports),e=qr(o),o=_t(o),a=0,f=r.interpolate||D,c="__p+='",f=Yt((r.escape||D).source+"|"+f.source+"|"+(f===F?P:D).source+"|"+(r.evaluate||D).source+"|$","g");n.replace(f,function(t,r,e,o,f,l){return e||(e=o),c+=n.slice(a,l).replace(q,i),r&&(c+="'+__e("+r+")+'"),f&&(u=y,c+="';"+f+";__p+='"),e&&(c+="'+((__t=("+e+"))==null?'':__t)+'"),a=l+t.length,t -}),c+="';\n",f=r=r.variable,f||(r="obj",c="with("+r+"){"+c+"}"),c=(u?c.replace(I,""):c).replace(B,"$1").replace(N,"$1;"),c="function("+r+"){"+(f?"":r+"||("+r+"={});")+"var __t,__p='',__e=_.escape"+(u?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+c+"return __p}";try{var l=Ut(e,"return "+c).apply(m,o)}catch(p){throw p.source=c,p}return t?l(t):(l.source=c,l)},_.unescape=function(n){return n==d?"":Zt(n).replace(Gr,ct)},_.uniqueId=function(n){var t=++C;return Zt(n==d?"":n)+t -},_.all=Ct,_.any=It,_.detect=kt,_.findWhere=kt,_.foldl=St,_.foldr=At,_.include=jt,_.inject=St,Ur(_,function(n,t){_.prototype[t]||(_.prototype[t]=function(){var t=[this.__wrapped__];return gr.apply(t,arguments),n.apply(_,t)})}),_.first=Nt,_.last=function(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&t!=d){var o=u;for(t=_.createCallback(t,r);o--&&t(n[o],o,n);)e++}else if(e=t,e==d||r)return n[u-1];return v(n,kr(0,u-e))}},_.take=Nt,_.head=Nt,Ur(_,function(n,t){_.prototype[t]||(_.prototype[t]=function(t,r){var e=n(this.__wrapped__,t,r); -return t==d||r&&typeof t!="function"?e:new j(e)})}),_.VERSION="1.3.1",_.prototype.toString=function(){return Zt(this.__wrapped__)},_.prototype.value=Ht,_.prototype.valueOf=Ht,Tr(["join","pop","shift"],function(n){var t=tr[n];_.prototype[n]=function(){return t.apply(this.__wrapped__,arguments)}}),Tr(["push","reverse","sort","unshift"],function(n){var t=tr[n];_.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),Tr(["concat","slice","splice"],function(n){var t=tr[n];_.prototype[n]=function(){return new j(t.apply(this.__wrapped__,arguments)) -}}),Pr.spliceObjects||Tr(["pop","shift","splice"],function(n){var t=tr[n],r="splice"==n;_.prototype[n]=function(){var n=this.__wrapped__,e=t.apply(n,arguments);return 0===n.length&&delete n[0],r?new j(e):e}}),_}var m,y=!0,d=null,b=!1,_=[],j=[],C=0,w={},x={},O=+new Date+"",E=75,S=40,A=" \t\x0B\f\xa0\ufeff\n\r\u2028\u2029\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000",I=/\b__p\+='';/g,B=/\b(__p\+=)''\+/g,N=/(__e\(.*?\)|\b__t\))\+'';/g,P=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,z=/\w*$/,F=/<%=([\s\S]+?)%>/g,$=RegExp("^["+A+"]*0+(?=.$)"),D=/($^)/,R=(R=/\bthis\b/)&&R.test(h)&&R,q=/['\n\r\t\u2028\u2029\\]/g,T="Array Boolean Date Error Function Math Number Object RegExp String _ attachEvent clearTimeout isFinite isNaN parseInt setImmediate setTimeout".split(" "),W="constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" "),L="[object Arguments]",G="[object Array]",H="[object Boolean]",J="[object Date]",K="[object Error]",M="[object Function]",U="[object Number]",V="[object Object]",Q="[object RegExp]",X="[object String]",Y={}; +}function l(n){return typeof n.toString!="function"&&typeof(n+"")=="string"}function p(){}function s(n){n.length=0,_.lengthr?0:r);++e=E&&i===t,v=u||p?f():l;if(p){var h=a(v);h?(i=r,v=h):(p=b,v=u?v:(s(v),l))}for(;++oi(v,m))&&((u||p)&&v.push(m),l.push(h))}return p?(s(v.b),g(v)):u&&s(v),l}function tt(n,t,r,e){function u(){var e=arguments,c=a?this:t;return o||(n=t[i]),r.length&&(e=e.length?(e=Er.call(e),f?e.concat(r):r.concat(e)):r),this instanceof u?(c=ot(n.prototype),e=n.apply(c,e),ht(e)?e:c):n.apply(c,e) +}var o=vt(n),a=!r,i=t;if(a){var f=e;r=t}else if(!o){if(!e)throw new Zt;t=n}return u}function et(){var n=c(),t=x.p;n.g=W,n.b=n.c=n.f=n.h="",n.e="r",n.i=y,n.j=!!t;for(var r,e=0;r=arguments[e];e++)for(var u in r)n[u]=r[u];e=n.a,n.d=/^[^,]+/.exec(e)[0],r=Mt,e="return function("+e+"){",u="var m,r="+n.d+",C="+n.e+";if(!r)return C;"+n.h+";",n.b?(u+="var s=r.length;m=-1;if("+n.b+"){",Nr.unindexedChars&&(u+="if(q(r)){r=r.split('')}"),u+="while(++mk;k++)u+="m='"+n.g[k]+"';if((!(p&&v[m])&&l.call(r,m))",n.i||(u+="||(!v[m]&&r[m]!==y[m])"),u+="){"+n.f+"}"; +u+="}"}return(n.b||Nr.nonEnumArgs)&&(u+="}"),u+=n.c+";return C",r=r("i,j,l,indicatorObject,n,o,q,t,u,y,z,w,G,H,J",e+u+"}"),g(n),r(K,tr,pr,w,lt,$r,yt,t,_,rr,Z,Br,X,er,mr)}function ot(n){return ht(n)?dr(n):{}}function at(n){return Tr[n]}function it(){var n=(n=_.indexOf)===Nt?t:n;return n}function ft(n){var t,r;return!n||mr.call(n)!=V||(t=n.constructor,vt(t)&&!(t instanceof t))||!Nr.argsClass&<(n)||!Nr.nodeClass&&l(n)?b:Nr.ownLast?(Kr(n,function(n,t,e){return r=pr.call(e,t),b}),r!==false):(Kr(n,function(n,t){r=t +}),r===m||pr.call(n,r))}function ct(n){return Wr[n]}function lt(n){return n&&typeof n=="object"?mr.call(n)==L:b}function pt(n,t,r,e,u,o){var a=n;if(typeof t!="boolean"&&t!=d&&(e=r,r=t,t=b),typeof r=="function"){if(r=typeof e=="undefined"?r:_.createCallback(r,e,1),a=r(a),typeof a!="undefined")return a;a=n}if(e=ht(a)){var i=mr.call(a);if(!Y[i]||!Nr.nodeClass&&l(a))return a;var c=$r(a)}if(!e||!t)return e?c?v(a):Hr({},a):a;switch(e=Ir[i],i){case H:case J:return new e(+a);case U:case X:return new e(a); +case Q:return e(a.source,z.exec(a))}i=!u,u||(u=f()),o||(o=f());for(var p=u.length;p--;)if(u[p]==n)return o[p];return a=c?e(a.length):{},c&&(pr.call(n,"index")&&(a.index=n.index),pr.call(n,"input")&&(a.input=n.input)),u.push(n),o.push(a),(c?qr:Mr)(n,function(n,e){a[e]=pt(n,t,r,m,u,o)}),i&&(s(u),s(o)),a}function st(n){var t=[];return Kr(n,function(n,r){vt(n)&&t.push(r)}),t.sort()}function gt(n){for(var t=-1,r=Rr(n),e=r.length,u={};++tr?wr(0,o+r):r)||0,o&&typeof o=="number"?a=-1<(yt(n)?n.indexOf(t,r):u(n,t,r)):qr(n,function(n){return++eo&&(o=i)}}else t=!t&&yt(n)?u:_.createCallback(t,r),qr(n,function(n,r,u){r=t(n,r,u),r>e&&(e=r,o=n) +});return o}function Et(n,t,r,e){var u=3>arguments.length;if(t=_.createCallback(t,e,4),$r(n)){var o=-1,a=n.length;for(u&&(r=n[++o]);++oarguments.length;if(typeof o!="number")var i=Rr(n),o=i.length;else Nr.unindexedChars&&yt(n)&&(u=n.split(""));return t=_.createCallback(t,e,4),kt(n,function(n,e,f){e=i?i[--o]:--o,r=a?(a=b,u[e]):t(r,u[e],e,f)}),r}function At(n,t,r){var e;if(t=_.createCallback(t,r),$r(n)){r=-1; +for(var u=n.length;++r=E&&u===t;if(c){var l=a(i);l?(u=r,i=l):c=b}for(;++eu(i,l)&&f.push(l);return c&&g(i),f}function Bt(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&t!=d){var o=-1;for(t=_.createCallback(t,r);++oe?wr(0,u+e):e||0}else if(e)return e=zt(n,r),n[e]===r?e:-1;return n?t(n,r,e):-1}function Pt(n,t,r){if(typeof t!="number"&&t!=d){var e=0,u=-1,o=n?n.length:0;for(t=_.createCallback(t,r);++u>>1,r(n[e])r?0:r);++tc&&(i=n.apply(f,a));else{var r=new Kt;!s&&!h&&(l=r);var e=p-(r-l);0/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:F,variable:"",imports:{_:_}};var Pr={a:"x,F,k",h:"var a=arguments,b=0,c=typeof k=='number'?2:a.length;while(++b":">",'"':""","'":"'"},Wr=gt(Tr),Lr=Xt("("+Rr(Wr).join("|")+")","g"),Gr=Xt("["+Rr(Tr).join("")+"]","g"),Hr=et(Pr,{h:Pr.h.replace(";",";if(c>3&&typeof a[c-2]=='function'){var d=u.createCallback(a[--c-1],a[c--],2)}else if(c>2&&typeof a[c-1]=='function'){d=a[--c]}"),f:"C[m]=d?d(C[m],r[m]):r[m]"}),Jr=et(Pr),Kr=et(zr,Fr,{i:b}),Mr=et(zr,Fr),Ur=x.o=function(n,t,r,e,u,o){var a=r===w; +if(typeof r=="function"&&!a){r=_.createCallback(r,e,2);var i=r(n,t);if(typeof i!="undefined")return!!i}if(n===t)return 0!==n||1/n==1/t;var c=typeof n,p=typeof t;if(n===n&&(!n||"function"!=c&&"object"!=c)&&(!t||"function"!=p&&"object"!=p))return b;if(n==d||t==d)return n===t;if(p=mr.call(n),c=mr.call(t),p==L&&(p=V),c==L&&(c=V),p!=c)return b;switch(p){case H:case J:return+n==+t;case U:return n!=+n?t!=+t:0==n?1/n==1/t:n==+t;case Q:case X:return n==Yt(t)}if(c=p==G,!c){if(pr.call(n,"__wrapped__")||pr.call(t,"__wrapped__"))return Ur(n.__wrapped__||n,t.__wrapped__||t,r,e,u,o); +if(p!=V||!Nr.nodeClass&&(l(n)||l(t)))return b;var p=!Nr.argsObject&<(n)?Qt:n.constructor,g=!Nr.argsObject&<(t)?Qt:t.constructor;if(p!=g&&(!vt(p)||!(p instanceof p&&vt(g)&&g instanceof g)))return b}for(g=!u,u||(u=f()),o||(o=f()),p=u.length;p--;)if(u[p]==n)return o[p]==t;var v=0,i=y;if(u.push(n),o.push(t),c){if(p=n.length,v=t.length,i=v==n.length,!i&&!a)return i;for(;v--;)if(c=p,g=t[v],a)for(;c--&&!(i=Ur(n[c],g,r,e,u,o)););else if(!(i=Ur(n[v],g,r,e,u,o)))break;return i}return Kr(t,function(t,a,f){return pr.call(f,a)?(v++,i=pr.call(n,a)&&Ur(n[a],t,r,e,u,o)):void 0 +}),i&&!a&&Kr(n,function(n,t,r){return pr.call(r,t)?i=-1<--v:void 0}),g&&(s(u),s(o)),i};vt(/x/)&&(vt=function(n){return typeof n=="function"&&mr.call(n)==M});var Vr=lr?function(n){if(!n||mr.call(n)!=V||!Nr.argsClass&<(n))return b;var t=n.valueOf,r=typeof t=="function"&&(r=lr(t))&&lr(r);return r?n==r||lr(n)==r:ft(n)}:ft,Qr=xt;Ar&&rt&&typeof vr=="function"&&(Tt=Rt(vr,e));var Xr=8==xr(A+"08")?xr:function(n,t){return xr(yt(n)?n.replace($,""):n,t||0)};return _.after=function(n,t){return function(){return 1>--n?t.apply(this,arguments):void 0 +}},_.assign=Hr,_.at=function(n){var t=-1,r=S(arguments,y,b,1),e=r.length,u=Ht(e);for(Nr.unindexedChars&&yt(n)&&(n=n.split(""));++t=E&&a(o?e[o]:h)}n:for(;++c(y?r(y,m):l(h,m))){for(o=u,(y||h).push(m);--o;)if(y=i[o],0>(y?r(y,m):l(e[o],m)))continue n; +v.push(m)}}for(;u--;)(y=i[u])&&g(y);return s(i),s(h),v},_.invert=gt,_.invoke=function(n,t){var r=Er.call(arguments,2),e=-1,u=typeof t=="function",o=n?n.length:0,a=Ht(typeof o=="number"?o:0);return kt(n,function(n){a[++e]=(u?t:n[t]).apply(n,r)}),a},_.keys=Rr,_.map=xt,_.max=Ot,_.memoize=function(n,t){function r(){var e=r.cache,u=O+(t?t.apply(this,arguments):arguments[0]);return pr.call(e,u)?e[u]:e[u]=n.apply(this,arguments)}return r.cache={},r},_.merge=dt,_.min=function(n,t,r){var e=1/0,o=e;if(!t&&$r(n)){r=-1; +for(var a=n.length;++re(a,r))&&(o[r]=n)}),o},_.once=function(n){var t,r;return function(){return t?r:(t=y,r=n.apply(this,arguments),n=d,r)}},_.pairs=function(n){for(var t=-1,r=Rr(n),e=r.length,u=Ht(e);++tr?wr(0,e+r):kr(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},_.mixin=Lt,_.noConflict=function(){return e._=ur,this},_.parseInt=Xr,_.random=function(n,t){n==d&&t==d&&(t=1),n=+n||0,t==d?(t=n,n=0):t=+t||0;var r=Or();return n%1||t%1?n+kr(r*(t-n+parseFloat("1e-"+((r+"").length-1))),t):n+fr(r*(t-n+1))},_.reduce=Et,_.reduceRight=St,_.result=function(n,t){var r=n?n[t]:m;return vt(r)?n[t]():r},_.runInContext=h,_.size=function(n){var t=n?n.length:0; +return typeof t=="number"?t:Rr(n).length},_.some=At,_.sortedIndex=zt,_.template=function(n,t,r){var e=_.templateSettings;n||(n=""),r=Jr({},r,e);var u,o=Jr({},r.imports,e.imports),e=Rr(o),o=bt(o),a=0,f=r.interpolate||D,c="__p+='",f=Xt((r.escape||D).source+"|"+f.source+"|"+(f===F?P:D).source+"|"+(r.evaluate||D).source+"|$","g");n.replace(f,function(t,r,e,o,f,l){return e||(e=o),c+=n.slice(a,l).replace(q,i),r&&(c+="'+__e("+r+")+'"),f&&(u=y,c+="';"+f+";__p+='"),e&&(c+="'+((__t=("+e+"))==null?'':__t)+'"),a=l+t.length,t +}),c+="';\n",f=r=r.variable,f||(r="obj",c="with("+r+"){"+c+"}"),c=(u?c.replace(I,""):c).replace(B,"$1").replace(N,"$1;"),c="function("+r+"){"+(f?"":r+"||("+r+"={});")+"var __t,__p='',__e=_.escape"+(u?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+c+"return __p}";try{var l=Mt(e,"return "+c).apply(m,o)}catch(p){throw p.source=c,p}return t?l(t):(l.source=c,l)},_.unescape=function(n){return n==d?"":Yt(n).replace(Lr,ct)},_.uniqueId=function(n){var t=++C;return Yt(n==d?"":n)+t +},_.all=jt,_.any=At,_.detect=wt,_.findWhere=wt,_.foldl=Et,_.foldr=St,_.include=_t,_.inject=Et,Mr(_,function(n,t){_.prototype[t]||(_.prototype[t]=function(){var t=[this.__wrapped__];return sr.apply(t,arguments),n.apply(_,t)})}),_.first=Bt,_.last=function(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&t!=d){var o=u;for(t=_.createCallback(t,r);o--&&t(n[o],o,n);)e++}else if(e=t,e==d||r)return n[u-1];return v(n,wr(0,u-e))}},_.take=Bt,_.head=Bt,Mr(_,function(n,t){_.prototype[t]||(_.prototype[t]=function(t,r){var e=n(this.__wrapped__,t,r); +return t==d||r&&typeof t!="function"?e:new j(e)})}),_.VERSION="1.3.1",_.prototype.toString=function(){return Yt(this.__wrapped__)},_.prototype.value=Gt,_.prototype.valueOf=Gt,qr(["join","pop","shift"],function(n){var t=nr[n];_.prototype[n]=function(){return t.apply(this.__wrapped__,arguments)}}),qr(["push","reverse","sort","unshift"],function(n){var t=nr[n];_.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),qr(["concat","slice","splice"],function(n){var t=nr[n];_.prototype[n]=function(){return new j(t.apply(this.__wrapped__,arguments)) +}}),Nr.spliceObjects||qr(["pop","shift","splice"],function(n){var t=nr[n],r="splice"==n;_.prototype[n]=function(){var n=this.__wrapped__,e=t.apply(n,arguments);return 0===n.length&&delete n[0],r?new j(e):e}}),_}var m,y=!0,d=null,b=!1,_=[],j=[],C=0,w={},x={},O=+new Date+"",E=75,S=40,A=" \t\x0B\f\xa0\ufeff\n\r\u2028\u2029\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000",I=/\b__p\+='';/g,B=/\b(__p\+=)''\+/g,N=/(__e\(.*?\)|\b__t\))\+'';/g,P=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,z=/\w*$/,F=/<%=([\s\S]+?)%>/g,$=RegExp("^["+A+"]*0+(?=.$)"),D=/($^)/,R=(R=/\bthis\b/)&&R.test(h)&&R,q=/['\n\r\t\u2028\u2029\\]/g,T="Array Boolean Date Error Function Math Number Object RegExp String _ attachEvent clearTimeout isFinite isNaN parseInt setImmediate setTimeout".split(" "),W="constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" "),L="[object Arguments]",G="[object Array]",H="[object Boolean]",J="[object Date]",K="[object Error]",M="[object Function]",U="[object Number]",V="[object Object]",Q="[object RegExp]",X="[object String]",Y={}; Y[M]=b,Y[L]=Y[G]=Y[H]=Y[J]=Y[U]=Y[V]=Y[Q]=Y[X]=y;var Z={"boolean":b,"function":y,object:y,number:b,string:b,undefined:b},nt={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},tt=Z[typeof exports]&&exports,rt=Z[typeof module]&&module&&module.exports==tt&&module,et=Z[typeof global]&&global;!et||et.global!==et&&et.window!==et||(n=et);var ut=h();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(n._=ut, define(function(){return ut})):tt&&!tt.nodeType?rt?(rt.exports=ut)._=ut:tt._=ut:n._=ut }(this); \ No newline at end of file diff --git a/dist/lodash.js b/dist/lodash.js index d0495c905..3b8bfe2f9 100644 --- a/dist/lodash.js +++ b/dist/lodash.js @@ -22,8 +22,8 @@ /** Used internally to indicate various things */ var indicatorObject = {}; - /** Used to avoid reference errors in `createIterator` */ - var iteratorObject = {}; + /** Used to avoid reference errors and circular dependency errors */ + var dependencyObject = {}; /** Used to prefix keys to avoid issues with `__proto__` and properties on `Object.prototype` */ var keyPrefix = +new Date + ''; @@ -942,7 +942,7 @@ * _.keys({ 'one': 1, 'two': 2, 'three': 3 }); * // => ['one', 'two', 'three'] (order is not guaranteed) */ - var keys = iteratorObject.keys = !nativeKeys ? shimKeys : function(object) { + var keys = dependencyObject.keys = !nativeKeys ? shimKeys : function(object) { if (!isObject(object)) { return []; } @@ -1558,7 +1558,7 @@ * }); * // => true */ - function isEqual(a, b, callback, thisArg, stackA, stackB) { + var isEqual = dependencyObject.isEqual = function(a, b, callback, thisArg, stackA, stackB) { // used to indicate that when comparing objects, `a` has at least the properties of `b` var whereIndicator = callback === indicatorObject; if (typeof callback == 'function' && !whereIndicator) { @@ -1714,7 +1714,7 @@ releaseArray(stackB); } return result; - } + }; /** * Checks if `value` is, or can be coerced to, a finite number. @@ -4409,7 +4409,7 @@ var length = props.length, result = false; while (length--) { - if (!(result = isEqual(object[props[length]], func[props[length]], indicatorObject))) { + if (!(result = dependencyObject.isEqual(object[props[length]], func[props[length]], indicatorObject))) { break; } } diff --git a/dist/lodash.min.js b/dist/lodash.min.js index fe356442f..c239a293f 100644 --- a/dist/lodash.min.js +++ b/dist/lodash.min.js @@ -5,43 +5,43 @@ */ ;!function(n){function t(n,t,e){e=(e||0)-1;for(var r=n?n.length:0;++et||typeof n=="undefined")return 1;if(ne?0:e);++r=C&&i===t,g=u||v?f():s;if(v){var y=o(g);y?(i=e,g=y):(v=b,g=u?g:(l(g),s))}for(;++ai(g,h))&&((u||v)&&g.push(h),s.push(y))}return v?(l(g.b),p(g)):u&&l(g),s}function ut(n,t,e,r){function u(){var r=arguments,c=o?this:t; -return a||(n=t[i]),e.length&&(r=r.length?(r=xe.call(r),f?r.concat(e):e.concat(r)):e),this instanceof u?(c=yt(n.prototype)?he(n.prototype):{},r=n.apply(c,r),yt(r)?r:c):n.apply(c,r)}var a=gt(n),o=!e,i=t;if(o){var f=r;e=t}else if(!a){if(!r)throw new ne;t=n}return u}function at(n){return Ie[n]}function ot(){var n=(n=nt.indexOf)===Bt?t:n;return n}function it(n){var t,e;return n&&ge.call(n)==U&&(t=n.constructor,!gt(t)||t instanceof t)?(x(n,function(n,t){e=t}),e===g||le.call(n,e)):b}function ft(n){return Ne[n] -}function ct(n){return n&&typeof n=="object"?ge.call(n)==q:b}function lt(n,t,e,r,u,a){var o=n;if(typeof t!="boolean"&&t!=h&&(r=e,e=t,t=b),typeof e=="function"){if(e=typeof r=="undefined"?e:nt.createCallback(e,r,1),o=e(o),typeof o!="undefined")return o;o=n}if(r=yt(o)){var i=ge.call(o);if(!H[i])return o;var c=Se(o)}if(!r||!t)return r?c?s(o):Q({},o):o;switch(r=Oe[i],i){case W:case P:return new r(+o);case M:case G:return new r(o);case V:return r(o.source,N.exec(o))}i=!u,u||(u=f()),a||(a=f());for(var p=u.length;p--;)if(u[p]==n)return a[p]; -return o=c?r(o.length):{},c&&(le.call(n,"index")&&(o.index=n.index),le.call(n,"input")&&(o.input=n.input)),u.push(n),a.push(o),(c?Ct:d)(n,function(n,r){o[r]=lt(n,t,e,g,u,a)}),i&&(l(u),l(a)),o}function pt(n){var t=[];return x(n,function(n,e){gt(n)&&t.push(e)}),t.sort()}function st(n){for(var t=-1,e=Ae(n),r=e.length,u={};++te?ke(0,a+e):e)||0,a&&typeof a=="number"?o=-1<(bt(n)?n.indexOf(t,e):u(n,t,e)):d(n,function(n){return++ra&&(a=i) -}}else t=!t&&bt(n)?u:nt.createCallback(t,e),Ct(n,function(n,e,u){e=t(n,e,u),e>r&&(r=e,a=n)});return a}function Et(n,t){var e=-1,r=n?n.length:0;if(typeof r=="number")for(var u=Vt(r);++earguments.length;t=nt.createCallback(t,r,4);var a=-1,o=n.length;if(typeof o=="number")for(u&&(e=n[++a]);++aarguments.length; -if(typeof u!="number")var o=Ae(n),u=o.length;return t=nt.createCallback(t,r,4),Ct(n,function(r,i,f){i=o?o[--u]:--u,e=a?(a=b,n[i]):t(e,n[i],i,f)}),e}function It(n,t,e){var r;t=nt.createCallback(t,e),e=-1;var u=n?n.length:0;if(typeof u=="number")for(;++e=C&&u===t;if(c){var l=o(i);l?(u=e,i=l):c=b}for(;++ru(i,l)&&f.push(l);return c&&p(i),f -}function $t(n,t,e){if(n){var r=0,u=n.length;if(typeof t!="number"&&t!=h){var a=-1;for(t=nt.createCallback(t,e);++ar?ke(0,u+r):r||0}else if(r)return r=Rt(n,e),n[r]===e?r:-1;return n?t(n,e,r):-1}function Ft(n,t,e){if(typeof t!="number"&&t!=h){var r=0,u=-1,a=n?n.length:0;for(t=nt.createCallback(t,e);++u>>1,e(n[r])e?0:e);++tc&&(i=n.apply(f,o));else{var e=new Ht;!s&&!m&&(l=e);var r=p-(e-l);0/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:$,variable:"",imports:{_:nt}};var Se=be,Ae=j.o=_e?function(n){return yt(n)?_e(n):[]}:Y,Ie={"&":"&","<":"<",">":">",'"':""","'":"'"},Ne=st(Ie),$e=Yt("("+Ae(Ne).join("|")+")","g"),Be=Yt("["+Ae(Ie).join("")+"]","g");return Lt&&X&&typeof se=="function"&&(Pt=zt(se,r)),Gt=8==we(O+"08")?we:function(n,t){return we(bt(n)?n.replace(B,""):n,t||0) -},nt.after=function(n,t){return function(){return 1>--n?t.apply(this,arguments):void 0}},nt.assign=Q,nt.at=function(n){for(var t=-1,e=et(arguments,y,b,1),r=e.length,u=Vt(r);++t=C&&o(a?r[a]:y)}n:for(;++c(b?e(b,h):s(y,h))){for(a=u,(b||y).push(h);--a;)if(b=i[a],0>(b?e(b,h):s(r[a],h)))continue n;g.push(h)}}for(;u--;)(b=i[u])&&p(b);return l(i),l(y),g},nt.invert=st,nt.invoke=function(n,t){var e=xe.call(arguments,2),r=-1,u=typeof t=="function",a=n?n.length:0,o=Vt(typeof a=="number"?a:0);return Ct(n,function(n){o[++r]=(u?t:n[t]).apply(n,e)}),o},nt.keys=Ae,nt.map=xt,nt.max=Ot,nt.memoize=function(n,t){function e(){var r=e.cache,u=w+(t?t.apply(this,arguments):arguments[0]); -return le.call(r,u)?r[u]:r[u]=n.apply(this,arguments)}return e.cache={},e},nt.merge=mt,nt.min=function(n,t,e){var r=1/0,a=r;if(!t&&Se(n)){e=-1;for(var o=n.length;++er(o,e))&&(a[e]=n)}),a},nt.once=function(n){var t,e; -return function(){return t?e:(t=y,e=n.apply(this,arguments),n=h,e)}},nt.pairs=function(n){for(var t=-1,e=Ae(n),r=e.length,u=Vt(r);++te?ke(0,r+e):je(e,r-1))+1);r--;)if(n[r]===t)return r;return-1},nt.mixin=Mt,nt.noConflict=function(){return r._=re,this},nt.parseInt=Gt,nt.random=function(n,t){n==h&&t==h&&(t=1),n=+n||0,t==h?(t=n,n=0):t=+t||0;var e=Ce();return n%1||t%1?n+je(e*(t-n+parseFloat("1e-"+((e+"").length-1))),t):n+ie(e*(t-n+1))},nt.reduce=St,nt.reduceRight=At,nt.result=function(n,t){var e=n?n[t]:g; -return gt(e)?n[t]():e},nt.runInContext=v,nt.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:Ae(n).length},nt.some=It,nt.sortedIndex=Rt,nt.template=function(n,t,e){var r=nt.templateSettings;n||(n=""),e=L({},e,r);var u,a=L({},e.imports,r.imports),r=Ae(a),a=dt(a),o=0,f=e.interpolate||F,c="__p+='",f=Yt((e.escape||F).source+"|"+f.source+"|"+(f===$?I:F).source+"|"+(e.evaluate||F).source+"|$","g");n.replace(f,function(t,e,r,a,f,l){return r||(r=a),c+=n.slice(o,l).replace(T,i),e&&(c+="'+__e("+e+")+'"),f&&(u=y,c+="';"+f+";__p+='"),r&&(c+="'+((__t=("+r+"))==null?'':__t)+'"),o=l+t.length,t -}),c+="';\n",f=e=e.variable,f||(e="obj",c="with("+e+"){"+c+"}"),c=(u?c.replace(E,""):c).replace(S,"$1").replace(A,"$1;"),c="function("+e+"){"+(f?"":e+"||("+e+"={});")+"var __t,__p='',__e=_.escape"+(u?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+c+"return __p}";try{var l=Jt(r,"return "+c).apply(g,a)}catch(p){throw p.source=c,p}return t?l(t):(l.source=c,l)},nt.unescape=function(n){return n==h?"":Zt(n).replace($e,ft)},nt.uniqueId=function(n){var t=++_;return Zt(n==h?"":n)+t -},nt.all=kt,nt.any=It,nt.detect=wt,nt.findWhere=wt,nt.foldl=St,nt.foldr=At,nt.include=_t,nt.inject=St,d(nt,function(n,t){nt.prototype[t]||(nt.prototype[t]=function(){var t=[this.__wrapped__];return pe.apply(t,arguments),n.apply(nt,t)})}),nt.first=$t,nt.last=function(n,t,e){if(n){var r=0,u=n.length;if(typeof t!="number"&&t!=h){var a=u;for(t=nt.createCallback(t,e);a--&&t(n[a],a,n);)r++}else if(r=t,r==h||e)return n[u-1];return s(n,ke(0,u-r))}},nt.take=$t,nt.head=$t,d(nt,function(n,t){nt.prototype[t]||(nt.prototype[t]=function(t,e){var r=n(this.__wrapped__,t,e); -return t==h||e&&typeof t!="function"?r:new tt(r)})}),nt.VERSION="1.3.1",nt.prototype.toString=function(){return Zt(this.__wrapped__)},nt.prototype.value=Ut,nt.prototype.valueOf=Ut,Ct(["join","pop","shift"],function(n){var t=te[n];nt.prototype[n]=function(){return t.apply(this.__wrapped__,arguments)}}),Ct(["push","reverse","sort","unshift"],function(n){var t=te[n];nt.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),Ct(["concat","slice","splice"],function(n){var t=te[n];nt.prototype[n]=function(){return new tt(t.apply(this.__wrapped__,arguments)) +}function l(n){n.length=0,m.lengthe?0:e);++r=C&&i===t,g=u||v?f():s;if(v){var y=o(g);y?(i=e,g=y):(v=b,g=u?g:(l(g),s))}for(;++ai(g,h))&&((u||v)&&g.push(h),s.push(y))}return v?(l(g.b),p(g)):u&&l(g),s}function ut(n,t,e,r){function u(){var r=arguments,c=o?this:t; +return a||(n=t[i]),e.length&&(r=r.length?(r=Ce.call(r),f?r.concat(e):e.concat(r)):e),this instanceof u?(c=gt(n.prototype)?ye(n.prototype):{},r=n.apply(c,r),gt(r)?r:c):n.apply(c,r)}var a=vt(n),o=!e,i=t;if(o){var f=r;e=t}else if(!a){if(!r)throw new Zt;t=n}return u}function at(n){return Ae[n]}function ot(){var n=(n=nt.indexOf)===$t?t:n;return n}function it(n){var t,e;return n&&ve.call(n)==U&&(t=n.constructor,!vt(t)||t instanceof t)?(x(n,function(n,t){e=t}),e===g||ce.call(n,e)):b}function ft(n){return Ie[n] +}function ct(n){return n&&typeof n=="object"?ve.call(n)==q:b}function lt(n,t,e,r,u,a){var o=n;if(typeof t!="boolean"&&t!=h&&(r=e,e=t,t=b),typeof e=="function"){if(e=typeof r=="undefined"?e:nt.createCallback(e,r,1),o=e(o),typeof o!="undefined")return o;o=n}if(r=gt(o)){var i=ve.call(o);if(!H[i])return o;var c=Ee(o)}if(!r||!t)return r?c?s(o):Q({},o):o;switch(r=xe[i],i){case W:case P:return new r(+o);case M:case G:return new r(o);case V:return r(o.source,N.exec(o))}i=!u,u||(u=f()),a||(a=f());for(var p=u.length;p--;)if(u[p]==n)return a[p]; +return o=c?r(o.length):{},c&&(ce.call(n,"index")&&(o.index=n.index),ce.call(n,"input")&&(o.input=n.input)),u.push(n),a.push(o),(c?wt:d)(n,function(n,r){o[r]=lt(n,t,e,g,u,a)}),i&&(l(u),l(a)),o}function pt(n){var t=[];return x(n,function(n,e){vt(n)&&t.push(e)}),t.sort()}function st(n){for(var t=-1,e=Se(n),r=e.length,u={};++te?_e(0,a+e):e)||0,a&&typeof a=="number"?o=-1<(ht(n)?n.indexOf(t,e):u(n,t,e)):d(n,function(n){return++ra&&(a=i)}}else t=!t&&ht(n)?u:nt.createCallback(t,e),wt(n,function(n,e,u){e=t(n,e,u),e>r&&(r=e,a=n)});return a}function Ot(n,t){var e=-1,r=n?n.length:0;if(typeof r=="number")for(var u=Ut(r);++earguments.length;t=nt.createCallback(t,r,4);var a=-1,o=n.length;if(typeof o=="number")for(u&&(e=n[++a]);++aarguments.length;if(typeof u!="number")var o=Se(n),u=o.length;return t=nt.createCallback(t,r,4),wt(n,function(r,i,f){i=o?o[--u]:--u,e=a?(a=b,n[i]):t(e,n[i],i,f)}),e}function At(n,t,e){var r;t=nt.createCallback(t,e),e=-1;var u=n?n.length:0; +if(typeof u=="number")for(;++e=C&&u===t;if(c){var l=o(i);l?(u=e,i=l):c=b}for(;++ru(i,l)&&f.push(l);return c&&p(i),f}function Nt(n,t,e){if(n){var r=0,u=n.length;if(typeof t!="number"&&t!=h){var a=-1;for(t=nt.createCallback(t,e);++ar?_e(0,u+r):r||0}else if(r)return r=Ft(n,e),n[r]===e?r:-1;return n?t(n,e,r):-1}function Bt(n,t,e){if(typeof t!="number"&&t!=h){var r=0,u=-1,a=n?n.length:0;for(t=nt.createCallback(t,e);++u>>1,e(n[r])e?0:e);++tc&&(i=n.apply(f,o));else{var e=new Gt;!s&&!m&&(l=e);var r=p-(e-l);0/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:$,variable:"",imports:{_:nt}};var Ee=he,Se=j.p=de?function(n){return gt(n)?de(n):[]}:Y,Ae={"&":"&","<":"<",">":">",'"':""","'":"'"},Ie=st(Ae),Ne=Xt("("+Se(Ie).join("|")+")","g"),$e=Xt("["+Se(Ae).join("")+"]","g"),Be=j.o=function(n,t,e,r,u,a){var o=e===k;if(typeof e=="function"&&!o){e=nt.createCallback(e,r,2); +var i=e(n,t);if(typeof i!="undefined")return!!i}if(n===t)return 0!==n||1/n==1/t;var c=typeof n,p=typeof t;if(n===n&&(!n||"function"!=c&&"object"!=c)&&(!t||"function"!=p&&"object"!=p))return b;if(n==h||t==h)return n===t;if(p=ve.call(n),c=ve.call(t),p==q&&(p=U),c==q&&(c=U),p!=c)return b;switch(p){case W:case P:return+n==+t;case M:return n!=+n?t!=+t:0==n?1/n==1/t:n==+t;case V:case G:return n==Yt(t)}if(c=p==z,!c){if(ce.call(n,"__wrapped__")||ce.call(t,"__wrapped__"))return Be(n.__wrapped__||n,t.__wrapped__||t,e,r,u,a); +if(p!=U)return b;var p=n.constructor,s=t.constructor;if(p!=s&&(!vt(p)||!(p instanceof p&&vt(s)&&s instanceof s)))return b}for(s=!u,u||(u=f()),a||(a=f()),p=u.length;p--;)if(u[p]==n)return a[p]==t;var v=0,i=y;if(u.push(n),a.push(t),c){if(p=n.length,v=t.length,i=v==n.length,!i&&!o)return i;for(;v--;)if(c=p,s=t[v],o)for(;c--&&!(i=Be(n[c],s,e,r,u,a)););else if(!(i=Be(n[v],s,e,r,u,a)))break;return i}return x(t,function(t,o,f){return ce.call(f,o)?(v++,i=ce.call(n,o)&&Be(n[o],t,e,r,u,a)):void 0}),i&&!o&&x(n,function(n,t,e){return ce.call(e,t)?i=-1<--v:void 0 +}),s&&(l(u),l(a)),i};return Jt&&X&&typeof pe=="function"&&(Wt=qt(pe,r)),Vt=8==je(O+"08")?je:function(n,t){return je(ht(n)?n.replace(B,""):n,t||0)},nt.after=function(n,t){return function(){return 1>--n?t.apply(this,arguments):void 0}},nt.assign=Q,nt.at=function(n){for(var t=-1,e=et(arguments,y,b,1),r=e.length,u=Ut(r);++t=C&&o(a?r[a]:y)}n:for(;++c(b?e(b,h):s(y,h))){for(a=u,(b||y).push(h);--a;)if(b=i[a],0>(b?e(b,h):s(r[a],h)))continue n;g.push(h)}}for(;u--;)(b=i[u])&&p(b);return l(i),l(y),g},nt.invert=st,nt.invoke=function(n,t){var e=Ce.call(arguments,2),r=-1,u=typeof t=="function",a=n?n.length:0,o=Ut(typeof a=="number"?a:0);return wt(n,function(n){o[++r]=(u?t:n[t]).apply(n,e)}),o},nt.keys=Se,nt.map=Ct,nt.max=xt,nt.memoize=function(n,t){function e(){var r=e.cache,u=w+(t?t.apply(this,arguments):arguments[0]); +return ce.call(r,u)?r[u]:r[u]=n.apply(this,arguments)}return e.cache={},e},nt.merge=bt,nt.min=function(n,t,e){var r=1/0,a=r;if(!t&&Ee(n)){e=-1;for(var o=n.length;++er(o,e))&&(a[e]=n)}),a},nt.once=function(n){var t,e; +return function(){return t?e:(t=y,e=n.apply(this,arguments),n=h,e)}},nt.pairs=function(n){for(var t=-1,e=Se(n),r=e.length,u=Ut(r);++te?_e(0,r+e):ke(e,r-1))+1);r--;)if(n[r]===t)return r;return-1},nt.mixin=Kt,nt.noConflict=function(){return r._=ee,this},nt.parseInt=Vt,nt.random=function(n,t){n==h&&t==h&&(t=1),n=+n||0,t==h?(t=n,n=0):t=+t||0;var e=we();return n%1||t%1?n+ke(e*(t-n+parseFloat("1e-"+((e+"").length-1))),t):n+oe(e*(t-n+1))},nt.reduce=Et,nt.reduceRight=St,nt.result=function(n,t){var e=n?n[t]:g; +return vt(e)?n[t]():e},nt.runInContext=v,nt.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:Se(n).length},nt.some=At,nt.sortedIndex=Ft,nt.template=function(n,t,e){var r=nt.templateSettings;n||(n=""),e=L({},e,r);var u,a=L({},e.imports,r.imports),r=Se(a),a=mt(a),o=0,f=e.interpolate||F,c="__p+='",f=Xt((e.escape||F).source+"|"+f.source+"|"+(f===$?I:F).source+"|"+(e.evaluate||F).source+"|$","g");n.replace(f,function(t,e,r,a,f,l){return r||(r=a),c+=n.slice(o,l).replace(T,i),e&&(c+="'+__e("+e+")+'"),f&&(u=y,c+="';"+f+";__p+='"),r&&(c+="'+((__t=("+r+"))==null?'':__t)+'"),o=l+t.length,t +}),c+="';\n",f=e=e.variable,f||(e="obj",c="with("+e+"){"+c+"}"),c=(u?c.replace(E,""):c).replace(S,"$1").replace(A,"$1;"),c="function("+e+"){"+(f?"":e+"||("+e+"={});")+"var __t,__p='',__e=_.escape"+(u?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+c+"return __p}";try{var l=Ht(r,"return "+c).apply(g,a)}catch(p){throw p.source=c,p}return t?l(t):(l.source=c,l)},nt.unescape=function(n){return n==h?"":Yt(n).replace(Ne,ft)},nt.uniqueId=function(n){var t=++_;return Yt(n==h?"":n)+t +},nt.all=_t,nt.any=At,nt.detect=jt,nt.findWhere=jt,nt.foldl=Et,nt.foldr=St,nt.include=dt,nt.inject=Et,d(nt,function(n,t){nt.prototype[t]||(nt.prototype[t]=function(){var t=[this.__wrapped__];return le.apply(t,arguments),n.apply(nt,t)})}),nt.first=Nt,nt.last=function(n,t,e){if(n){var r=0,u=n.length;if(typeof t!="number"&&t!=h){var a=u;for(t=nt.createCallback(t,e);a--&&t(n[a],a,n);)r++}else if(r=t,r==h||e)return n[u-1];return s(n,_e(0,u-r))}},nt.take=Nt,nt.head=Nt,d(nt,function(n,t){nt.prototype[t]||(nt.prototype[t]=function(t,e){var r=n(this.__wrapped__,t,e); +return t==h||e&&typeof t!="function"?r:new tt(r)})}),nt.VERSION="1.3.1",nt.prototype.toString=function(){return Yt(this.__wrapped__)},nt.prototype.value=Mt,nt.prototype.valueOf=Mt,wt(["join","pop","shift"],function(n){var t=ne[n];nt.prototype[n]=function(){return t.apply(this.__wrapped__,arguments)}}),wt(["push","reverse","sort","unshift"],function(n){var t=ne[n];nt.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),wt(["concat","slice","splice"],function(n){var t=ne[n];nt.prototype[n]=function(){return new tt(t.apply(this.__wrapped__,arguments)) }}),nt}var g,y=!0,h=null,b=!1,m=[],d=[],_=0,k={},j={},w=+new Date+"",C=75,x=40,O=" \t\x0B\f\xa0\ufeff\n\r\u2028\u2029\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000",E=/\b__p\+='';/g,S=/\b(__p\+=)''\+/g,A=/(__e\(.*?\)|\b__t\))\+'';/g,I=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,N=/\w*$/,$=/<%=([\s\S]+?)%>/g,B=RegExp("^["+O+"]*0+(?=.$)"),F=/($^)/,R=(R=/\bthis\b/)&&R.test(v)&&R,T=/['\n\r\t\u2028\u2029\\]/g,D="Array Boolean Date Function Math Number Object RegExp String _ attachEvent clearTimeout isFinite isNaN parseInt setImmediate setTimeout".split(" "),q="[object Arguments]",z="[object Array]",W="[object Boolean]",P="[object Date]",K="[object Function]",M="[object Number]",U="[object Object]",V="[object RegExp]",G="[object String]",H={}; H[K]=b,H[q]=H[z]=H[W]=H[P]=H[M]=H[U]=H[V]=H[G]=y;var J={"boolean":b,"function":y,object:y,number:b,string:b,undefined:b},L={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},Q=J[typeof exports]&&exports,X=J[typeof module]&&module&&module.exports==Q&&module,Y=J[typeof global]&&global;!Y||Y.global!==Y&&Y.window!==Y||(n=Y);var Z=v();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(n._=Z, define(function(){return Z})):Q&&!Q.nodeType?X?(X.exports=Z)._=Z:Q._=Z:n._=Z }(this); \ No newline at end of file diff --git a/dist/lodash.underscore.js b/dist/lodash.underscore.js index bc603c1d3..cb3b7b580 100644 --- a/dist/lodash.underscore.js +++ b/dist/lodash.underscore.js @@ -18,8 +18,8 @@ /** Used internally to indicate various things */ var indicatorObject = {}; - /** Used to avoid reference errors in `createIterator` */ - var iteratorObject = {}; + /** Used to avoid reference errors and circular dependency errors */ + var dependencyObject = {}; /** Used to prefix keys to avoid issues with `__proto__` and properties on `Object.prototype` */ var keyPrefix = +new Date + ''; @@ -619,7 +619,7 @@ * _.keys({ 'one': 1, 'two': 2, 'three': 3 }); * // => ['one', 'two', 'three'] (order is not guaranteed) */ - var keys = iteratorObject.keys = !nativeKeys ? shimKeys : function(object) { + var keys = dependencyObject.keys = !nativeKeys ? shimKeys : function(object) { if (!isObject(object)) { return []; } @@ -1051,7 +1051,7 @@ * }); * // => true */ - function isEqual(a, b, stackA, stackB) { + var isEqual = dependencyObject.isEqual = function(a, b, stackA, stackB) { if (a === b) { return a !== 0 || (1 / a == 1 / b); } @@ -1147,7 +1147,7 @@ }); } return result; - } + }; /** * Checks if `value` is, or can be coerced to, a finite number. diff --git a/dist/lodash.underscore.min.js b/dist/lodash.underscore.min.js index 2fd2d49bd..968e34ce6 100644 --- a/dist/lodash.underscore.min.js +++ b/dist/lodash.underscore.min.js @@ -3,34 +3,34 @@ * Lo-Dash 1.3.1 (Custom Build) lodash.com/license | Underscore.js 1.5.1 underscorejs.org/LICENSE * Build: `lodash underscore exports="amd,commonjs,global,node" -o ./dist/lodash.underscore.js` */ -;!function(n){function t(n,t,r){r=(r||0)-1;for(var e=n?n.length:0;++rt||typeof n=="undefined")return 1;if(nu(a,c))&&(r&&a.push(c),o.push(f))}return o}function c(n,t,r,e){function u(){var e=arguments,c=o?this:t;return i||(n=t[a]),r.length&&(e=e.length?(e=Rt.call(e),f?e.concat(r):r.concat(e)):r),this instanceof u?(c=l(n.prototype),e=n.apply(c,e),w(e)?e:c):n.apply(c,e)}var i=j(n),o=!r,a=t;if(o){var f=e;r=t}else if(!i){if(!e)throw new TypeError;t=n}return u}function l(n){return w(n)?xt(n):{} -}function p(n){return Mt[n]}function s(){var n=(n=i.indexOf)===z?t:n;return n}function v(n){return $t[n]}function g(n){return n&&typeof n=="object"?jt.call(n)==tt:!1}function h(n){if(!n)return n;for(var t=1,r=arguments.length;te&&(e=r,u=n)});else for(;++iu&&(u=r);return u}function k(n,t){var r=-1,e=n?n.length:0; -if(typeof e=="number")for(var u=Array(e);++rarguments.length;t=G(t,e,4);var i=-1,o=n.length;if(typeof o=="number")for(u&&(r=n[++i]);++iarguments.length;if(typeof u!="number")var o=qt(n),u=o.length;return t=G(t,e,4),N(n,function(e,a,f){a=o?o[--u]:--u,r=i?(i=!1,n[a]):t(r,n[a],a,f)}),r}function M(n,t,r){var e; -t=G(t,r),r=-1;var u=n?n.length:0;if(typeof u=="number")for(;++rr(u,o)&&i.push(o)}return i}function W(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&null!=t){var i=-1;for(t=G(t,r);++ie?St(0,u+e):e||0}else if(e)return e=P(n,r),n[e]===r?e:-1;return n?t(n,r,e):-1}function C(n,t,r){if(typeof t!="number"&&null!=t){var e=0,u=-1,i=n?n.length:0;for(t=G(t,r);++u>>1,r(n[e])c&&(a=n.apply(f,o));else{var r=new Date;!s&&!h&&(l=r); -var e=p-(r-l);0/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},xt||(l=function(n){if(w(n)){u.prototype=n;var t=new u;u.prototype=null}return t||{}}),g(arguments)||(g=function(n){return n&&typeof n=="object"?dt.call(n,"callee"):!1});var Dt=At||function(n){return n&&typeof n=="object"?jt.call(n)==rt:!1},At=function(n){var t,r=[]; -if(!n||!ct[typeof n])return r;for(t in n)dt.call(n,t)&&r.push(t);return r},qt={}.o=Tt?function(n){return w(n)?Tt(n):[]}:At,Mt={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"},$t=_(Mt),It=RegExp("("+qt($t).join("|")+")","g"),Wt=RegExp("["+qt(Mt).join("")+"]","g"),zt=function(n,t){var r;if(!n||!ct[typeof n])return n;for(r in n)if(t(n[r],r,n)===X)break;return n},Ct=function(n,t){var r;if(!n||!ct[typeof n])return n;for(r in n)if(dt.call(n,r)&&t(n[r],r,n)===X)break;return n}; -j(/x/)&&(j=function(n){return typeof n=="function"&&"[object Function]"==jt.call(n)}),i.after=function(n,t){return function(){return 1>--n?t.apply(this,arguments):void 0}},i.bind=V,i.bindAll=function(n){for(var t=1u(o,a)){for(var f=r;--f;)if(0>u(t[f],a))continue n;o.push(a)}}return o},i.invert=_,i.invoke=function(n,t){var r=Rt.call(arguments,2),e=-1,u=typeof t=="function",i=n?n.length:0,o=Array(typeof i=="number"?i:0); -return N(n,function(n){o[++e]=(u?t:n[t]).apply(n,r)}),o},i.keys=qt,i.map=R,i.max=B,i.memoize=function(n,t){var r={};return function(){var e=Y+(t?t.apply(this,arguments):arguments[0]);return dt.call(r,e)?r[e]:r[e]=n.apply(this,arguments)}},i.min=function(n,t,r){var e=1/0,u=e,i=-1,o=n?n.length:0;if(t||typeof o!="number")t=G(t,r),N(n,function(n,r,i){r=t(n,r,i),rt(r,u)&&(e[u]=n) -}),e},i.once=function(n){var t,r;return function(){return t?r:(t=!0,r=n.apply(this,arguments),n=null,r)}},i.pairs=function(n){for(var t=-1,r=qt(n),e=r.length,u=Array(e);++tt?0:t);++nr?St(0,e+r):Ft(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},i.mixin=K,i.noConflict=function(){return n._=ht,this},i.random=function(n,t){null==n&&null==t&&(t=1),n=+n||0,null==t?(t=n,n=0):t=+t||0;var r=Nt();return n%1||t%1?n+Ft(r*(t-n+parseFloat("1e-"+((r+"").length-1))),t):n+_t(r*(t-n+1))},i.reduce=D,i.reduceRight=q,i.result=function(n,t){var r=n?n[t]:L; -return j(r)?n[t]():r},i.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:qt(n).length},i.some=M,i.sortedIndex=P,i.template=function(n,t,r){var u=i.templateSettings;n||(n=""),r=y({},r,u);var o=0,a="__p+='",u=r.variable;n.replace(RegExp((r.escape||Z).source+"|"+(r.interpolate||Z).source+"|"+(r.evaluate||Z).source+"|$","g"),function(t,r,u,i,f){return a+=n.slice(o,f).replace(nt,e),r&&(a+="'+_['escape']("+r+")+'"),i&&(a+="';"+i+";__p+='"),u&&(a+="'+((__t=("+u+"))==null?'':__t)+'"),o=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 f=Function("_","return "+a)(i)}catch(c){throw c.source=a,c}return t?f(t):(f.source=a,f)},i.unescape=function(n){return null==n?"":(n+"").replace(It,v)},i.uniqueId=function(n){var t=++Q+"";return n?n+t:t},i.all=T,i.any=M,i.detect=F,i.findWhere=function(n,t){return $(n,t,!0)},i.foldl=D,i.foldr=q,i.include=E,i.inject=D,i.first=W,i.last=function(n,t,r){if(n){var e=0,u=n.length; -if(typeof t!="number"&&null!=t){var i=u;for(t=G(t,r);i--&&t(n[i],i,n);)e++}else if(e=t,null==e||r)return n[u-1];return Rt.call(n,St(0,u-e))}},i.take=W,i.head=W,i.VERSION="1.3.1",K(i),i.prototype.chain=function(){return this.__chain__=!0,this},i.prototype.value=function(){return this.__wrapped__},N("pop push reverse shift sort splice unshift".split(" "),function(n){var t=gt[n];i.prototype[n]=function(){var n=this.__wrapped__;return t.apply(n,arguments),!kt.spliceObjects&&0===n.length&&delete n[0],this -}}),N(["concat","join","slice"],function(n){var t=gt[n];i.prototype[n]=function(){var n=t.apply(this.__wrapped__,arguments);return this.__chain__&&(n=new o(n),n.__chain__=!0),n}}),typeof define=="function"&&typeof define.amd=="object"&&define.amd?(n._=i, define(function(){return i})):pt&&!pt.nodeType?st?(st.exports=i)._=i:pt._=i:n._=i}(this); \ No newline at end of file +;!function(n){function t(n,t,r){r=(r||0)-1;for(var e=n?n.length:0;++rt||typeof n=="undefined")return 1;if(nu(a,c))&&(r&&a.push(c),i.push(f))}return i}function c(n,t,r,e){function u(){var e=arguments,c=i?this:t;return o||(n=t[a]),r.length&&(e=e.length?(e=Et.call(e),f?e.concat(r):r.concat(e)):r),this instanceof u?(c=l(n.prototype),e=n.apply(c,e),j(e)?e:c):n.apply(c,e)}var o=b(n),i=!r,a=t;if(i){var f=e;r=t}else if(!o){if(!e)throw new TypeError;t=n}return u}function l(n){return j(n)?_t(n):{} +}function p(n){return Nt[n]}function s(){var n=(n=o.indexOf)===W?t:n;return n}function v(n){return Bt[n]}function g(n){return n&&typeof n=="object"?yt.call(n)==tt:!1}function h(n){if(!n)return n;for(var t=1,r=arguments.length;te&&(e=r,u=n) +});else for(;++ou&&(u=r);return u}function B(n,t){var r=-1,e=n?n.length:0;if(typeof e=="number")for(var u=Array(e);++rarguments.length;t=V(t,e,4);var o=-1,i=n.length;if(typeof i=="number")for(u&&(r=n[++o]);++oarguments.length;if(typeof u!="number")var i=Ft(n),u=i.length;return t=V(t,e,4),R(n,function(e,a,f){a=i?i[--u]:--u,r=o?(o=!1,n[a]):t(r,n[a],a,f) +}),r}function q(n,t,r){var e;t=V(t,r),r=-1;var u=n?n.length:0;if(typeof u=="number")for(;++rr(u,i)&&o.push(i)}return o}function I(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&null!=t){var o=-1;for(t=V(t,r);++oe?xt(0,u+e):e||0}else if(e)return e=C(n,r),n[e]===r?e:-1;return n?t(n,r,e):-1}function z(n,t,r){if(typeof t!="number"&&null!=t){var e=0,u=-1,o=n?n.length:0;for(t=V(t,r);++u>>1,r(n[e])c&&(a=n.apply(f,i));else{var r=new Date;!s&&!h&&(l=r); +var e=p-(r-l);0/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},_t||(l=function(n){if(j(n)){u.prototype=n;var t=new u;u.prototype=null}return t||{}}),g(arguments)||(g=function(n){return n&&typeof n=="object"?gt.call(n,"callee"):!1});var Rt=dt||function(n){return n&&typeof n=="object"?"[object Array]"==yt.call(n):!1 +},dt=function(n){var t,r=[];if(!n||!ut[typeof n])return r;for(t in n)gt.call(n,t)&&r.push(t);return r},Ft=X.p=wt?function(n){return j(n)?wt(n):[]}:dt,Nt={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"},Bt=_(Nt),kt=RegExp("("+Ft(Bt).join("|")+")","g"),Dt=RegExp("["+Ft(Nt).join("")+"]","g"),qt=function(n,t){var r;if(!n||!ut[typeof n])return n;for(r in n)if(t(n[r],r,n)===Q)break;return n},Mt=function(n,t){var r;if(!n||!ut[typeof n])return n;for(r in n)if(gt.call(n,r)&&t(n[r],r,n)===Q)break; +return n},$t=X.o=function(n,t,r,e){if(n===t)return 0!==n||1/n==1/t;var u=typeof n,i=typeof t;if(n===n&&(!n||"function"!=u&&"object"!=u)&&(!t||"function"!=i&&"object"!=i))return!1;if(null==n||null==t)return n===t;if(i=yt.call(n),u=yt.call(t),i!=u)return!1;switch(i){case"[object Boolean]":case"[object Date]":return+n==+t;case rt:return n!=+n?t!=+t:0==n?1/n==1/t:n==+t;case"[object RegExp]":case et:return n==t+""}if(u="[object Array]"==i,!u){if(n instanceof o||t instanceof o)return $t(n.__wrapped__||n,t.__wrapped__||t,r,e); +if("[object Object]"!=i)return!1;var i=n.constructor,a=t.constructor;if(i!=a&&(!b(i)||!(i instanceof i&&b(a)&&a instanceof a)))return!1}for(r||(r=[]),e||(e=[]),i=r.length;i--;)if(r[i]==n)return e[i]==t;var f=!0,c=0;if(r.push(n),e.push(t),u){if(c=t.length,f=c==n.length)for(;c--&&(f=$t(n[c],t[c],r,e)););return f}return qt(t,function(t,u,o){return gt.call(o,u)?(c++,!(f=gt.call(n,u)&&$t(n[u],t,r,e))&&Q):void 0}),f&&qt(n,function(n,t,r){return gt.call(r,t)?!(f=-1<--c)&&Q:void 0}),f};b(/x/)&&(b=function(n){return typeof n=="function"&&"[object Function]"==yt.call(n) +}),o.after=function(n,t){return function(){return 1>--n?t.apply(this,arguments):void 0}},o.bind=U,o.bindAll=function(n){for(var t=1u(i,a)){for(var f=r;--f;)if(0>u(t[f],a))continue n;i.push(a)}}return i},o.invert=_,o.invoke=function(n,t){var r=Et.call(arguments,2),e=-1,u=typeof t=="function",o=n?n.length:0,i=Array(typeof o=="number"?o:0);return R(n,function(n){i[++e]=(u?t:n[t]).apply(n,r)}),i},o.keys=Ft,o.map=F,o.max=N,o.memoize=function(n,t){var r={}; +return function(){var e=Y+(t?t.apply(this,arguments):arguments[0]);return gt.call(r,e)?r[e]:r[e]=n.apply(this,arguments)}},o.min=function(n,t,r){var e=1/0,u=e,o=-1,i=n?n.length:0;if(t||typeof i!="number")t=V(t,r),R(n,function(n,r,o){r=t(n,r,o),rt(r,u)&&(e[u]=n)}),e},o.once=function(n){var t,r;return function(){return t?r:(t=!0,r=n.apply(this,arguments),n=null,r) +}},o.pairs=function(n){for(var t=-1,r=Ft(n),e=r.length,u=Array(e);++tt?0:t);++nr?xt(0,e+r):At(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},o.mixin=J,o.noConflict=function(){return n._=lt,this},o.random=function(n,t){null==n&&null==t&&(t=1),n=+n||0,null==t?(t=n,n=0):t=+t||0;var r=Ot();return n%1||t%1?n+At(r*(t-n+parseFloat("1e-"+((r+"").length-1))),t):n+vt(r*(t-n+1))},o.reduce=k,o.reduceRight=D,o.result=function(n,t){var r=n?n[t]:K;return b(r)?n[t]():r},o.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:Ft(n).length},o.some=q,o.sortedIndex=C,o.template=function(n,t,r){var u=o.templateSettings; +n||(n=""),r=y({},r,u);var i=0,a="__p+='",u=r.variable;n.replace(RegExp((r.escape||Z).source+"|"+(r.interpolate||Z).source+"|"+(r.evaluate||Z).source+"|$","g"),function(t,r,u,o,f){return a+=n.slice(i,f).replace(nt,e),r&&(a+="'+_['escape']("+r+")+'"),o&&(a+="';"+o+";__p+='"),u&&(a+="'+((__t=("+u+"))==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 f=Function("_","return "+a)(o)}catch(c){throw c.source=a,c}return t?f(t):(f.source=a,f)},o.unescape=function(n){return null==n?"":(n+"").replace(kt,v)},o.uniqueId=function(n){var t=++L+"";return n?n+t:t},o.all=E,o.any=q,o.detect=S,o.findWhere=function(n,t){return M(n,t,!0)},o.foldl=k,o.foldr=D,o.include=O,o.inject=k,o.first=I,o.last=function(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&null!=t){var o=u;for(t=V(t,r);o--&&t(n[o],o,n);)e++}else if(e=t,null==e||r)return n[u-1];return Et.call(n,xt(0,u-e)) +}},o.take=I,o.head=I,o.VERSION="1.3.1",J(o),o.prototype.chain=function(){return this.__chain__=!0,this},o.prototype.value=function(){return this.__wrapped__},R("pop push reverse shift sort splice unshift".split(" "),function(n){var t=ct[n];o.prototype[n]=function(){var n=this.__wrapped__;return t.apply(n,arguments),!St.spliceObjects&&0===n.length&&delete n[0],this}}),R(["concat","join","slice"],function(n){var t=ct[n];o.prototype[n]=function(){var n=t.apply(this.__wrapped__,arguments);return this.__chain__&&(n=new i(n),n.__chain__=!0),n +}}),typeof define=="function"&&typeof define.amd=="object"&&define.amd?(n._=o, define(function(){return o})):it&&!it.nodeType?at?(at.exports=o)._=o:it._=o:n._=o}(this); \ No newline at end of file