diff --git a/dist/lodash.compat.js b/dist/lodash.compat.js index c86a15196..8e6a12857 100644 --- a/dist/lodash.compat.js +++ b/dist/lodash.compat.js @@ -464,16 +464,6 @@ return typeof value.toString != 'function' && typeof (value + '') == 'string'; } - /** - * Used by `_.partition` to create partitioned arrays. - * - * @private - * @returns {Array} Returns the new array. - */ - function partitionInitializer() { - return [[], []]; - } - /** * A fallback implementation of `String#trim` to remove leading and trailing * whitespace or specified characters from `string`. @@ -3701,23 +3691,14 @@ function contains(collection, target, fromIndex) { var length = collection ? collection.length : 0; if (!(typeof length == 'number' && length > -1 && length <= maxSafeInteger)) { - var props = keys(collection); - length = props.length; + collection = values(collection); + length = collection.length; } if (typeof fromIndex == 'number') { fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : (fromIndex || 0); } else { fromIndex = 0; } - if (props) { - while (fromIndex < length) { - var value = collection[props[fromIndex++]]; - if (value === target) { - return true; - } - } - return false; - } if (typeof collection == 'string' || !isArray(collection) && isString(collection)) { if (fromIndex >= length) { return false; @@ -4398,7 +4379,7 @@ */ var partition = createAggregator(function(result, value, key) { result[key ? 0 : 1].push(value); - }, partitionInitializer); + }, function() { return [[], []]; }); /** * Retrieves the value of a specified property from all elements in the collection. diff --git a/dist/lodash.compat.min.js b/dist/lodash.compat.min.js index 70011762c..a226155a8 100644 --- a/dist/lodash.compat.min.js +++ b/dist/lodash.compat.min.js @@ -4,66 +4,66 @@ * Build: `lodash -o ./dist/lodash.compat.js` */ ;(function(){function n(n,t){return typeof n=="undefined"?t:n}function t(n,t){if(n!==t){if(n>t||typeof n=="undefined")return 1;if(ne||13e||8202r||13r||8202>>0:0,u=Tr(e);++ri(t,l)&&f.push(l);return f}function vt(n,t){var r=-1,e=n,u=n?n.length:0;if(typeof u=="number"&&-1a(s,g)&&((u||f)&&s.push(g),c.push(p))}return c}function It(n,t){for(var r=-1,e=t(n),u=e.length,o=Tr(u);++ri?0:i)}function Bt(n,t,e){var u=n?n.length:0;if(typeof e=="number")e=0>e?de(u+e,0):e||0;else if(e)return e=Mt(n,t),u&&n[e]===t?e:-1;return r(n,t,e)}function qt(n,t,r){var e=n?n.length:0;if(typeof t!="number"&&null!=t){var u=e,i=0;for(t=o.createCallback(t,r,3);u--&&t(n[u],u,n);)i++}else i=null==t||r?1:t;return i=e-(i||0),Kt(n,0,0>i?0:i)}function Ut(n,t,r){var e=n?n.length:0;if(typeof t!="number"&&null!=t){var u=e,i=0;for(t=o.createCallback(t,r,3);u--&&t(n[u],u,n);)i++}else if(i=t,null==i||r)return n?n[e-1]:x; -return i=e-(i||0),Kt(n,0>i?0:i)}function Zt(n,t,r){if(typeof t!="number"&&null!=t){var e=-1,u=n?n.length:0,i=0;for(t=o.createCallback(t,r,3);++et?0:t;return Kt(n,i)}function Kt(n,t,r){var e=-1,u=n?n.length:0;for(t=typeof t=="undefined"?0:+t||0,0>t?t=de(u+t,0):t>u&&(t=u),r=typeof r=="undefined"?u:+r||0,0>r?r=de(u+r,0):r>u&&(r=u),u=t>r?0:r-t,r=Tr(u);++e>>1,r(n[e])r?0:r);++t=e||e>Yr)var u=Pe(n),e=u.length;if(r=typeof r=="number"?0>r?de(e+r,0):r||0:0,u){for(;ri&&(i=l)}else t=null==t&&wr(n)?u:o.createCallback(t,r,3),vt(n,function(n,r,u){r=t(n,r,u),r>e&&(e=r,i=n)});return i}function or(n,t,r,e){var u=3>arguments.length;if(t=o.createCallback(t,e,4),Fe(n)){var i=-1,a=n.length;for(u&&a&&(r=n[++i]);++iarguments.length;return t=o.createCallback(t,e,4),yt(n,function(n,e,o){r=u?(u=false,n):t(r,n,e,o)}),r}function ar(n){var t=-1,r=n&&n.length,e=Tr(0>r?0:r>>>0);return vt(n,function(n){var r=At(0,++t);e[t]=e[r],e[r]=n}),e}function lr(n,t,r){var e;if(t=o.createCallback(t,r,3),Fe(n)){r=-1;for(var u=n.length;++rarguments.length)return Lt(n,C,null,t);if(n)var r=n[I]?n[I][2]:n.length,e=Kt(arguments,2),r=r-e.length; -return Lt(n,C|E,r,t,e)}function cr(n,t,r){var e,u,o,i,a,l,f,c=0,s=false,p=true;if(!mr(n))throw new Ur;if(t=0>t?0:t,true===r)var g=true,p=false;else dr(r)&&(g=r.leading,s="maxWait"in r&&de(t,+r.maxWait||0),p="trailing"in r?r.trailing:p);var h=function(){var r=t-(Ke()-i);0>=r||r>t?(u&&ne(u),r=f,u=l=f=x,r&&(c=Ke(),o=n.apply(a,e),l||u||(e=a=null))):l=le(h,r)},v=function(){l&&ne(l),u=l=f=x,(p||s!==t)&&(c=Ke(),o=n.apply(a,e),l||u||(e=a=null))};return function(){if(e=arguments,i=Ke(),a=this,f=p&&(l||!g),false===s)var r=g&&!l; -else{u||g||(c=i);var y=s-(i-c),m=0>=y||y>s;m?(u&&(u=ne(u)),c=i,o=n.apply(a,e)):u||(u=le(v,y))}return m&&l?l=ne(l):l||t===s||(l=le(h,t)),r&&(m=true,o=n.apply(a,e)),!m||l||u||(e=a=null),o}}function sr(n){if(!mr(n))throw new Ur;return function(){return!n.apply(this,arguments)}}function pr(n,t,r){var e=arguments;if(!n||2>e.length)return n;var u=0,o=e.length,i=typeof r;if("number"!=i&&"string"!=i||!e[3]||e[3][r]!==t||(o=2),3arguments.length)return t;var r=Kt(arguments);return r.push(n),pr.apply(null,r)}function hr(n){var t=[];return Ct(n,function(n,r){mr(n)&&t.push(r)}),t.sort()}function vr(n){return n&&typeof n=="object"&&typeof n.length=="number"&&Gr.call(n)==nt||false}function yr(n){return n&&typeof n=="object"&&1===n.nodeType&&(Ae.nodeClass?-1>>0,e=-1,u=r-1,o=Tr(r),i=0t||null==n||!ve(t))return r;n=qr(n);do t%2&&(r+=n),t=te(t/2),n+=n;while(t);return r}function Er(n,t,r){var e=typeof n;return"function"==e||null==n?(typeof t=="undefined"||!("prototype"in n))&&n||Y(n,t,r):"object"!=e?Nr(n):Sr(n)}function Ar(n){return n}function Sr(n){var t=Pe(n),r=t.length,e=t[0],u=r&&n[e];return 1!=r||u!==u||dr(u)?function(e){var u=r;if(u&&!e)return false; -for(var o=true;u--&&(o=t[u],o=ue.call(e,o)&&Ot(e[o],n[o],null,true)););return o}:function(n){return n&&ue.call(n,e)?(n=n[e],u===n&&(0!==u||1/u==1/n)):false}}function Ir(n,t,r){var e=true,u=t&&hr(t);t&&(r||u.length)||(null==r&&(r=t),t=n,n=o,u=hr(t)),false===r?e=false:dr(r)&&"chain"in r&&(e=r.chain),r=-1;for(var i=mr(n),a=u?u.length:0;++r--n?t.apply(this,arguments):void 0}},o.assign=pr,o.at=function(n,t){var r=arguments,e=-1,u=bt(r,true,false,1),o=u.length,i=typeof t; -for("number"!=i&&"string"!=i||!r[2]||r[2][t]!==n||(o=1),Ae.unindexedChars&&wr(n)&&(n=n.split("")),r=Tr(o);++earguments.length?Lt(t,C|j,null,n):Lt(t,C|j|E,null,n,Kt(arguments,2))},o.chain=function(n){return new i(n,true)},o.compact=function(n){for(var t=-1,r=n?n.length:0,e=0,u=[];++t(p?e(p,l):i(s,l))){for(t=u;--t;){var g=o[t]; -if(0>(g?e(g,l):i(n[t],l)))continue n}p&&p.push(l),s.push(l)}return s},o.invert=function(n,t){for(var r=-1,e=Pe(n),u=e.length,o={};++ro?0:o>>>0);return vt(n,function(n){var o=u?t:null!=n&&n[t];i[++e]=o?o.apply(n,r):x}),i},o.keys=Pe,o.keysIn=xr,o.map=er,o.mapValues=function(n,t,r){var e={};return t=o.createCallback(t,r,3),jt(n,function(n,r,u){e[r]=t(n,r,u) -}),e},o.matches=Sr,o.max=ur,o.memoize=function(n,t){if(!mr(n))throw new Ur;var r=function(){var e=r.cache,u=t?t.apply(this,arguments):"_"+arguments[0];return ue.call(e,u)?e[u]:e[u]=n.apply(this,arguments)};return r.cache={},r},o.merge=function(n,t,r){if(!n)return n;var e=arguments,u=e.length,o=typeof r;if("number"!=o&&"string"!=o||!e[3]||e[3][r]!==t||(u=2),3u?0:u>>>0);for(i||(t=o.createCallback(t,r,3)),vt(n,function(n,r,u){if(i)for(r=t.length,u=Tr(r);r--;)u[r]=n[t[r]]; -else u=t(n,r,u);f[++e]={a:u,b:e,c:n}}),u=f.length,f.sort(i?l:a);u--;)f[u]=f[u].c;return f},o.tap=function(n,t,r){return t.call(r,n),n},o.throttle=function(n,t,r){var e=true,u=true;if(!mr(n))throw new Ur;return false===r?e=false:dr(r)&&(e="leading"in r?!!r.leading:e,u="trailing"in r?!!r.trailing:u),st.leading=e,st.maxWait=+t,st.trailing=u,cr(n,t,st)},o.times=function(n,t,r){n=0>n?0:n>>>0,t=Y(t,r,1),r=-1;for(var e=Tr(n);++rr?0:+r||0,e))-t.length,0<=r&&n.indexOf(t,r)==r},o.escape=function(n){return null==n?"":qr(n).replace($,s)},o.escapeRegExp=kr,o.every=Ht,o.find=nr,o.findIndex=zt,o.findKey=function(n,t,r){return t=o.createCallback(t,r,3),mt(n,t,jt,true)},o.findLast=function(n,t,r){return t=o.createCallback(t,r,3),mt(n,t,yt) -},o.findLastIndex=function(n,t,r){var e=n?n.length:0;for(t=o.createCallback(t,r,3);e--;)if(t(n[e],e,n))return e;return-1},o.findLastKey=function(n,t,r){return t=o.createCallback(t,r,3),mt(n,t,kt,true)},o.has=function(n,t){return n?ue.call(n,t):false},o.identity=Ar,o.indexOf=Bt,o.isArguments=vr,o.isArray=Fe,o.isBoolean=function(n){return true===n||false===n||n&&typeof n=="object"&&Gr.call(n)==rt||false},o.isDate=function(n){return n&&typeof n=="object"&&Gr.call(n)==et||false},o.isElement=yr,o.isEmpty=function(n){var t=true; -if(!n)return t;var r=Gr.call(n),e=n.length;return-1r?de(e+r,0):be(r||0,e-1))+1);e--;)if(n[e]===t)return e;return-1},o.mixin=Ir,o.noConflict=function(){return t._=Xr,this},o.noop=Rr,o.now=Ke,o.pad=function(n,t,r){n=null==n?"":qr(n),t=+t;var e=n.length;return er?0:+r||0,n.length),n.lastIndexOf(t,r)==r},o.template=function(n,t,r){var e=o.templateSettings;r=gr({},r,e),n=qr(null==n?"":n);var u,i,a=gr({},r.imports,e.imports),e=Pe(a),a=jr(a),l=0,f=r.interpolate||M,c="__p+='",f=Br((r.escape||M).source+"|"+f.source+"|"+(f===D?B:M).source+"|"+(r.evaluate||M).source+"|$","g"); -n.replace(f,function(t,r,e,o,a,f){return e||(e=o),c+=n.slice(l,f).replace(X,p),r&&(u=true,c+="'+__e("+r+")+'"),a&&(i=true,c+="';"+a+";\n__p+='"),e&&(c+="'+((__t=("+e+"))==null?'':__t)+'"),l=f+t.length,t}),c+="';",(r=r.variable)||(c="with(obj){"+c+"}"),c=(i?c.replace(T,""):c).replace(L,"$1").replace(W,"$1;"),c="function("+(r||"obj")+"){"+(r?"":"obj||(obj={});")+"var __t,__p=''"+(u?",__e=_.escape":"")+(i?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+c+"return __p}";try{var s=$r(e,"return "+c).apply(x,a) -}catch(g){throw g.source=c,g}return t?s(t):(s.source=c,s)},o.trim=qe,o.trimLeft=Ue,o.trimRight=Ze,o.truncate=function(n,t){var r=30,e="...";if(t&&dr(t))var u="separator"in t?t.separator:u,r="length"in t?+t.length||0:r,e="omission"in t?qr(t.omission):e;else null!=t&&(r=+t||0);if(n=null==n?"":qr(n),r>=n.length)return n;var o=r-e.length;if(1>o)return e;if(r=n.slice(0,o),null==u)return r+e;if(_r(u)){if(n.slice(o).search(u)){var i,a,l=n.slice(0,o);for(u.global||(u=Br(u.source,(q.exec(u)||"")+"g")),u.lastIndex=0;i=u.exec(l);)a=i.index; -r=r.slice(0,null==a?o:a)}}else n.indexOf(u,o)!=o&&(u=r.lastIndexOf(u),-1n.indexOf(";")?n:n.replace(F,_))},o.uniqueId=function(n){var t=++R;return qr(null==n?"":n)+t},o.all=Ht,o.any=lr,o.detect=nr,o.findWhere=nr,o.foldl=or,o.foldr=ir,o.include=Gt,o.inject=or,Ir(function(){var n={};return jt(o,function(t,r){o.prototype[r]||(n[r]=t)}),n}(),false),o.first=Dt,o.last=Ut,o.sample=function(n,t,r){return n&&typeof n.length!="number"?n=jr(n):Ae.unindexedChars&&wr(n)&&(n=n.split("")),null==t||r?(t=n?n.length:0,0t?0:+t||0,n.length),n) -},o.take=Dt,o.takeRight=Ut,o.takeRightWhile=Ut,o.takeWhile=Dt,o.head=Dt,jt(o,function(n,t){var r="sample"!==t;o.prototype[t]||(o.prototype[t]=function(t,e){var u=this.__chain__,o=n(this.__wrapped__,t,e);return u||null!=t&&(!e||r&&typeof t=="function")?new i(o,u):o})}),o.VERSION=S,o.prototype.chain=function(){return this.__chain__=true,this},o.prototype.toJSON=Yt,o.prototype.toString=function(){return qr(this.__wrapped__)},o.prototype.value=Yt,o.prototype.valueOf=Yt,vt(["join","pop","shift"],function(n){var t=Zr[n]; -o.prototype[n]=function(){var n=this.__chain__,r=t.apply(this.__wrapped__,arguments);return n?new i(r,n):r}}),vt(["push","reverse","sort","unshift"],function(n){var t=Zr[n];o.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),vt(["concat","splice"],function(n){var t=Zr[n];o.prototype[n]=function(){return new i(t.apply(this.__wrapped__,arguments),this.__chain__)}}),Ae.spliceObjects||vt(["pop","shift","splice"],function(n){var t=Zr[n],r="splice"==n;o.prototype[n]=function(){var n=this.__chain__,e=this.__wrapped__,u=t.apply(e,arguments); -return 0===e.length&&delete e[0],n||r?new i(u,n):u}}),o}var x,C=1,j=2,k=4,O=8,E=16,A=32,S="2.4.1",I="__lodash@"+S+"__",R=0,N=/^[A-Z]+$/,T=/\b__p\+='';/g,L=/\b(__p\+=)''\+/g,W=/(__e\(.*?\)|\b__t\))\+'';/g,F=/&(?:amp|lt|gt|quot|#39);/g,$=/[&<>"']/g,P=/<%-([\s\S]+?)%>/g,z=/<%([\s\S]+?)%>/g,D=/<%=([\s\S]+?)%>/g,B=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,q=/\w*$/,U=/^\s*function[ \n\r\t]+\w/,Z=/^0[xX]/,K=/[\xC0-\xFF]/g,M=/($^)/,V=/[.*+?^${}()|[\]\\]/g,J=/\bthis\b/,X=/['\n\r\u2028\u2029\\]/g,Y=/[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[a-z]+|[0-9]+/g,G=" \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",H="Array Boolean Date Error Function Math Number Object RegExp Set String _ clearTimeout document isFinite isNaN parseInt setTimeout TypeError window WinRTError".split(" "),Q="constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" "),nt="[object Arguments]",tt="[object Array]",rt="[object Boolean]",et="[object Date]",ut="[object Error]",ot="[object Function]",it="[object Number]",at="[object Object]",lt="[object RegExp]",ft="[object String]",ct={}; -ct[ot]=false,ct[nt]=ct[tt]=ct[rt]=ct[et]=ct[it]=ct[at]=ct[lt]=ct[ft]=true;var st={leading:false,maxWait:0,trailing:false},pt={configurable:false,enumerable:false,value:null,writable:false},gt={"&":"&","<":"<",">":">",'"':""","'":"'"},ht={"&":"&","<":"<",">":">",""":'"',"'":"'"},vt={\u00c0:"A",\u00c1:"A",\u00c2:"A",\u00c3:"A",\u00c4:"A",\u00c5:"A",\u00e0:"a",\u00e1:"a",\u00e2:"a",\u00e3:"a",\u00e4:"a",\u00e5:"a",\u00c7:"C",\u00e7:"c",\u00d0:"D",\u00f0:"d",\u00c8:"E",\u00c9:"E",\u00ca:"E",\u00cb:"E",\u00e8:"e",\u00e9:"e",\u00ea:"e",\u00eb:"e",\u00cc:"I",\u00cd:"I",\u00ce:"I",\u00cf:"I",\u00ec:"i",\u00ed:"i",\u00ee:"i",\u00ef:"i",\u00d1:"N",\u00f1:"n",\u00d2:"O",\u00d3:"O",\u00d4:"O",\u00d5:"O",\u00d6:"O",\u00d8:"O",\u00f2:"o",\u00f3:"o",\u00f4:"o",\u00f5:"o",\u00f6:"o",\u00f8:"o",\u00d9:"U",\u00da:"U",\u00db:"U",\u00dc:"U",\u00f9:"u",\u00fa:"u",\u00fb:"u",\u00fc:"u",\u00dd:"Y",\u00fd:"y",\u00ff:"y",\u00c6:"AE",\u00e6:"ae",\u00de:"Th",\u00fe:"th",\u00df:"ss","\xd7":" ","\xf7":" "},yt={"function":true,object:true},mt={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},dt=yt[typeof window]&&window||this,bt=yt[typeof exports]&&exports&&!exports.nodeType&&exports,yt=yt[typeof module]&&module&&!module.nodeType&&module,_t=bt&&yt&&typeof global=="object"&&global; -!_t||_t.global!==_t&&_t.window!==_t&&_t.self!==_t||(dt=_t);var _t=yt&&yt.exports===bt&&bt,wt=w();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(dt._=wt, define(function(){return wt})):bt&&yt?_t?(yt.exports=wt)._=wt:bt._=wt:dt._=wt}).call(this); \ No newline at end of file +}function l(n,r){for(var e=-1,u=n.a,o=r.a,i=u.length;++ee||13e||8202r||13r||8202>>0:0,u=Nr(e);++ri(t,l)&&f.push(l);return f}function ht(n,t){var r=-1,e=n,u=n?n.length:0;if(typeof u=="number"&&-1a(s,g)&&((u||f)&&s.push(g),c.push(p))}return c}function St(n,t){for(var r=-1,e=t(n),u=e.length,o=Nr(u);++ri?0:i)}function Dt(n,t,e){var u=n?n.length:0;if(typeof e=="number")e=0>e?me(u+e,0):e||0;else if(e)return e=Kt(n,t),u&&n[e]===t?e:-1;return r(n,t,e)}function Bt(n,t,r){var e=n?n.length:0;if(typeof t!="number"&&null!=t){var u=e,i=0;for(t=o.createCallback(t,r,3);u--&&t(n[u],u,n);)i++}else i=null==t||r?1:t;return i=e-(i||0),Zt(n,0,0>i?0:i)}function qt(n,t,r){var e=n?n.length:0;if(typeof t!="number"&&null!=t){var u=e,i=0;for(t=o.createCallback(t,r,3);u--&&t(n[u],u,n);)i++}else if(i=t,null==i||r)return n?n[e-1]:w; +return i=e-(i||0),Zt(n,0>i?0:i)}function Ut(n,t,r){if(typeof t!="number"&&null!=t){var e=-1,u=n?n.length:0,i=0;for(t=o.createCallback(t,r,3);++et?0:t;return Zt(n,i)}function Zt(n,t,r){var e=-1,u=n?n.length:0;for(t=typeof t=="undefined"?0:+t||0,0>t?t=me(u+t,0):t>u&&(t=u),r=typeof r=="undefined"?u:+r||0,0>r?r=me(u+r,0):r>u&&(r=u),u=t>r?0:r-t,r=Nr(u);++e>>1,r(n[e])r?0:r);++tr?me(e+r,0):r||0:0,typeof n=="string"||!We(n)&&_r(n)?ri&&(i=l)}else t=null==t&&_r(n)?u:o.createCallback(t,r,3),ht(n,function(n,r,u){r=t(n,r,u),r>e&&(e=r,i=n)});return i}function ur(n,t,r,e){var u=3>arguments.length;if(t=o.createCallback(t,e,4),We(n)){var i=-1,a=n.length;for(u&&a&&(r=n[++i]);++iarguments.length;return t=o.createCallback(t,e,4),vt(n,function(n,e,o){r=u?(u=false,n):t(r,n,e,o)}),r}function ir(n){var t=-1,r=n&&n.length,e=Nr(0>r?0:r>>>0);return ht(n,function(n){var r=Et(0,++t);e[t]=e[r],e[r]=n}),e}function ar(n,t,r){var e;if(t=o.createCallback(t,r,3),We(n)){r=-1;for(var u=n.length;++rarguments.length)return Tt(n,x,null,t);if(n)var r=n[S]?n[S][2]:n.length,e=Zt(arguments,2),r=r-e.length; +return Tt(n,x|O,r,t,e)}function fr(n,t,r){var e,u,o,i,a,l,f,c=0,s=false,p=true;if(!yr(n))throw new qr;if(t=0>t?0:t,true===r)var g=true,p=false;else mr(r)&&(g=r.leading,s="maxWait"in r&&me(t,+r.maxWait||0),p="trailing"in r?r.trailing:p);var h=function(){var r=t-(Ze()-i);0>=r||r>t?(u&&Qr(u),r=f,u=l=f=w,r&&(c=Ze(),o=n.apply(a,e),l||u||(e=a=null))):l=ae(h,r)},v=function(){l&&Qr(l),u=l=f=w,(p||s!==t)&&(c=Ze(),o=n.apply(a,e),l||u||(e=a=null))};return function(){if(e=arguments,i=Ze(),a=this,f=p&&(l||!g),false===s)var r=g&&!l; +else{u||g||(c=i);var y=s-(i-c),m=0>=y||y>s;m?(u&&(u=Qr(u)),c=i,o=n.apply(a,e)):u||(u=ae(v,y))}return m&&l?l=Qr(l):l||t===s||(l=ae(h,t)),r&&(m=true,o=n.apply(a,e)),!m||l||u||(e=a=null),o}}function cr(n){if(!yr(n))throw new qr;return function(){return!n.apply(this,arguments)}}function sr(n,t,r){var e=arguments;if(!n||2>e.length)return n;var u=0,o=e.length,i=typeof r;if("number"!=i&&"string"!=i||!e[3]||e[3][r]!==t||(o=2),3arguments.length)return t;var r=Zt(arguments);return r.push(n),sr.apply(null,r)}function gr(n){var t=[];return xt(n,function(n,r){yr(n)&&t.push(r)}),t.sort()}function hr(n){return n&&typeof n=="object"&&typeof n.length=="number"&&Yr.call(n)==Q||false}function vr(n){return n&&typeof n=="object"&&1===n.nodeType&&(Ee.nodeClass?-1>>0,e=-1,u=r-1,o=Nr(r),i=0t||null==n||!he(t))return r;n=Br(n);do t%2&&(r+=n),t=ne(t/2),n+=n;while(t);return r}function Or(n,t,r){var e=typeof n;return"function"==e||null==n?(typeof t=="undefined"||!("prototype"in n))&&n||X(n,t,r):"object"!=e?Rr(n):Ar(n)}function Er(n){return n}function Ar(n){var t=$e(n),r=t.length,e=t[0],u=r&&n[e];return 1!=r||u!==u||mr(u)?function(e){var u=r;if(u&&!e)return false; +for(var o=true;u--&&(o=t[u],o=ee.call(e,o)&&kt(e[o],n[o],null,true)););return o}:function(n){return n&&ee.call(n,e)?(n=n[e],u===n&&(0!==u||1/u==1/n)):false}}function Sr(n,t,r){var e=true,u=t&&gr(t);t&&(r||u.length)||(null==r&&(r=t),t=n,n=o,u=gr(t)),false===r?e=false:mr(r)&&"chain"in r&&(e=r.chain),r=-1;for(var i=yr(n),a=u?u.length:0;++r--n?t.apply(this,arguments):void 0 +}},o.assign=sr,o.at=function(n,t){var r=arguments,e=-1,u=dt(r,true,false,1),o=u.length,i=typeof t;for("number"!=i&&"string"!=i||!r[2]||r[2][t]!==n||(o=1),Ee.unindexedChars&&_r(n)&&(n=n.split("")),r=Nr(o);++earguments.length?Tt(t,x|C,null,n):Tt(t,x|C|O,null,n,Zt(arguments,2))},o.chain=function(n){return new i(n,true) +},o.compact=function(n){for(var t=-1,r=n?n.length:0,e=0,u=[];++t(p?e(p,l):i(s,l))){for(t=u;--t;){var g=o[t];if(0>(g?e(g,l):i(n[t],l)))continue n}p&&p.push(l),s.push(l)}return s},o.invert=function(n,t){for(var r=-1,e=$e(n),u=e.length,o={};++ro?0:o>>>0);return ht(n,function(n){var o=u?t:null!=n&&n[t];i[++e]=o?o.apply(n,r):w +}),i},o.keys=$e,o.keysIn=wr,o.map=rr,o.mapValues=function(n,t,r){var e={};return t=o.createCallback(t,r,3),Ct(n,function(n,r,u){e[r]=t(n,r,u)}),e},o.matches=Ar,o.max=er,o.memoize=function(n,t){if(!yr(n))throw new qr;var r=function(){var e=r.cache,u=t?t.apply(this,arguments):"_"+arguments[0];return ee.call(e,u)?e[u]:e[u]=n.apply(this,arguments)};return r.cache={},r},o.merge=function(n,t,r){if(!n)return n;var e=arguments,u=e.length,o=typeof r;if("number"!=o&&"string"!=o||!e[3]||e[3][r]!==t||(u=2),3u?0:u>>>0);for(i||(t=o.createCallback(t,r,3)),ht(n,function(n,r,u){if(i)for(r=t.length,u=Nr(r);r--;)u[r]=n[t[r]]; +else u=t(n,r,u);f[++e]={a:u,b:e,c:n}}),u=f.length,f.sort(i?l:a);u--;)f[u]=f[u].c;return f},o.tap=function(n,t,r){return t.call(r,n),n},o.throttle=function(n,t,r){var e=true,u=true;if(!yr(n))throw new qr;return false===r?e=false:mr(r)&&(e="leading"in r?!!r.leading:e,u="trailing"in r?!!r.trailing:u),ct.leading=e,ct.maxWait=+t,ct.trailing=u,fr(n,t,ct)},o.times=function(n,t,r){n=0>n?0:n>>>0,t=X(t,r,1),r=-1;for(var e=Nr(n);++rr?0:+r||0,e))-t.length,0<=r&&n.indexOf(t,r)==r},o.escape=function(n){return null==n?"":Br(n).replace(F,s)},o.escapeRegExp=jr,o.every=Gt,o.find=Qt,o.findIndex=Pt,o.findKey=function(n,t,r){return t=o.createCallback(t,r,3),yt(n,t,Ct,true)},o.findLast=function(n,t,r){return t=o.createCallback(t,r,3),yt(n,t,vt) +},o.findLastIndex=function(n,t,r){var e=n?n.length:0;for(t=o.createCallback(t,r,3);e--;)if(t(n[e],e,n))return e;return-1},o.findLastKey=function(n,t,r){return t=o.createCallback(t,r,3),yt(n,t,jt,true)},o.has=function(n,t){return n?ee.call(n,t):false},o.identity=Er,o.indexOf=Dt,o.isArguments=hr,o.isArray=We,o.isBoolean=function(n){return true===n||false===n||n&&typeof n=="object"&&Yr.call(n)==tt||false},o.isDate=function(n){return n&&typeof n=="object"&&Yr.call(n)==rt||false},o.isElement=vr,o.isEmpty=function(n){var t=true; +if(!n)return t;var r=Yr.call(n),e=n.length;return-1r?me(e+r,0):de(r||0,e-1))+1);e--;)if(n[e]===t)return e;return-1},o.mixin=Sr,o.noConflict=function(){return t._=Jr,this},o.noop=Ir,o.now=Ze,o.pad=function(n,t,r){n=null==n?"":Br(n),t=+t;var e=n.length;return er?0:+r||0,n.length),n.lastIndexOf(t,r)==r},o.template=function(n,t,r){var e=o.templateSettings;r=pr({},r,e),n=Br(null==n?"":n);var u,i,a=pr({},r.imports,e.imports),e=$e(a),a=Cr(a),l=0,f=r.interpolate||K,c="__p+='",f=Dr((r.escape||K).source+"|"+f.source+"|"+(f===z?D:K).source+"|"+(r.evaluate||K).source+"|$","g"); +n.replace(f,function(t,r,e,o,a,f){return e||(e=o),c+=n.slice(l,f).replace(J,p),r&&(u=true,c+="'+__e("+r+")+'"),a&&(i=true,c+="';"+a+";\n__p+='"),e&&(c+="'+((__t=("+e+"))==null?'':__t)+'"),l=f+t.length,t}),c+="';",(r=r.variable)||(c="with(obj){"+c+"}"),c=(i?c.replace(N,""):c).replace(T,"$1").replace(L,"$1;"),c="function("+(r||"obj")+"){"+(r?"":"obj||(obj={});")+"var __t,__p=''"+(u?",__e=_.escape":"")+(i?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+c+"return __p}";try{var s=Fr(e,"return "+c).apply(w,a) +}catch(g){throw g.source=c,g}return t?s(t):(s.source=c,s)},o.trim=Be,o.trimLeft=qe,o.trimRight=Ue,o.truncate=function(n,t){var r=30,e="...";if(t&&mr(t))var u="separator"in t?t.separator:u,r="length"in t?+t.length||0:r,e="omission"in t?Br(t.omission):e;else null!=t&&(r=+t||0);if(n=null==n?"":Br(n),r>=n.length)return n;var o=r-e.length;if(1>o)return e;if(r=n.slice(0,o),null==u)return r+e;if(br(u)){if(n.slice(o).search(u)){var i,a,l=n.slice(0,o);for(u.global||(u=Dr(u.source,(B.exec(u)||"")+"g")),u.lastIndex=0;i=u.exec(l);)a=i.index; +r=r.slice(0,null==a?o:a)}}else n.indexOf(u,o)!=o&&(u=r.lastIndexOf(u),-1n.indexOf(";")?n:n.replace(W,b))},o.uniqueId=function(n){var t=++I;return Br(null==n?"":n)+t},o.all=Gt,o.any=ar,o.detect=Qt,o.findWhere=Qt,o.foldl=ur,o.foldr=or,o.include=Yt,o.inject=ur,Sr(function(){var n={};return Ct(o,function(t,r){o.prototype[r]||(n[r]=t)}),n}(),false),o.first=zt,o.last=qt,o.sample=function(n,t,r){return n&&typeof n.length!="number"?n=Cr(n):Ee.unindexedChars&&_r(n)&&(n=n.split("")),null==t||r?(t=n?n.length:0,0t?0:+t||0,n.length),n) +},o.take=zt,o.takeRight=qt,o.takeRightWhile=qt,o.takeWhile=zt,o.head=zt,Ct(o,function(n,t){var r="sample"!==t;o.prototype[t]||(o.prototype[t]=function(t,e){var u=this.__chain__,o=n(this.__wrapped__,t,e);return u||null!=t&&(!e||r&&typeof t=="function")?new i(o,u):o})}),o.VERSION=A,o.prototype.chain=function(){return this.__chain__=true,this},o.prototype.toJSON=Xt,o.prototype.toString=function(){return Br(this.__wrapped__)},o.prototype.value=Xt,o.prototype.valueOf=Xt,ht(["join","pop","shift"],function(n){var t=Ur[n]; +o.prototype[n]=function(){var n=this.__chain__,r=t.apply(this.__wrapped__,arguments);return n?new i(r,n):r}}),ht(["push","reverse","sort","unshift"],function(n){var t=Ur[n];o.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),ht(["concat","splice"],function(n){var t=Ur[n];o.prototype[n]=function(){return new i(t.apply(this.__wrapped__,arguments),this.__chain__)}}),Ee.spliceObjects||ht(["pop","shift","splice"],function(n){var t=Ur[n],r="splice"==n;o.prototype[n]=function(){var n=this.__chain__,e=this.__wrapped__,u=t.apply(e,arguments); +return 0===e.length&&delete e[0],n||r?new i(u,n):u}}),o}var w,x=1,C=2,j=4,k=8,O=16,E=32,A="2.4.1",S="__lodash@"+A+"__",I=0,R=/^[A-Z]+$/,N=/\b__p\+='';/g,T=/\b(__p\+=)''\+/g,L=/(__e\(.*?\)|\b__t\))\+'';/g,W=/&(?:amp|lt|gt|quot|#39);/g,F=/[&<>"']/g,$=/<%-([\s\S]+?)%>/g,P=/<%([\s\S]+?)%>/g,z=/<%=([\s\S]+?)%>/g,D=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,B=/\w*$/,q=/^\s*function[ \n\r\t]+\w/,U=/^0[xX]/,Z=/[\xC0-\xFF]/g,K=/($^)/,M=/[.*+?^${}()|[\]\\]/g,V=/\bthis\b/,J=/['\n\r\u2028\u2029\\]/g,X=/[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[a-z]+|[0-9]+/g,Y=" \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",G="Array Boolean Date Error Function Math Number Object RegExp Set String _ clearTimeout document isFinite isNaN parseInt setTimeout TypeError window WinRTError".split(" "),H="constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" "),Q="[object Arguments]",nt="[object Array]",tt="[object Boolean]",rt="[object Date]",et="[object Error]",ut="[object Function]",ot="[object Number]",it="[object Object]",at="[object RegExp]",lt="[object String]",ft={}; +ft[ut]=false,ft[Q]=ft[nt]=ft[tt]=ft[rt]=ft[ot]=ft[it]=ft[at]=ft[lt]=true;var ct={leading:false,maxWait:0,trailing:false},st={configurable:false,enumerable:false,value:null,writable:false},pt={"&":"&","<":"<",">":">",'"':""","'":"'"},gt={"&":"&","<":"<",">":">",""":'"',"'":"'"},ht={\u00c0:"A",\u00c1:"A",\u00c2:"A",\u00c3:"A",\u00c4:"A",\u00c5:"A",\u00e0:"a",\u00e1:"a",\u00e2:"a",\u00e3:"a",\u00e4:"a",\u00e5:"a",\u00c7:"C",\u00e7:"c",\u00d0:"D",\u00f0:"d",\u00c8:"E",\u00c9:"E",\u00ca:"E",\u00cb:"E",\u00e8:"e",\u00e9:"e",\u00ea:"e",\u00eb:"e",\u00cc:"I",\u00cd:"I",\u00ce:"I",\u00cf:"I",\u00ec:"i",\u00ed:"i",\u00ee:"i",\u00ef:"i",\u00d1:"N",\u00f1:"n",\u00d2:"O",\u00d3:"O",\u00d4:"O",\u00d5:"O",\u00d6:"O",\u00d8:"O",\u00f2:"o",\u00f3:"o",\u00f4:"o",\u00f5:"o",\u00f6:"o",\u00f8:"o",\u00d9:"U",\u00da:"U",\u00db:"U",\u00dc:"U",\u00f9:"u",\u00fa:"u",\u00fb:"u",\u00fc:"u",\u00dd:"Y",\u00fd:"y",\u00ff:"y",\u00c6:"AE",\u00e6:"ae",\u00de:"Th",\u00fe:"th",\u00df:"ss","\xd7":" ","\xf7":" "},vt={"function":true,object:true},yt={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},mt=vt[typeof window]&&window||this,dt=vt[typeof exports]&&exports&&!exports.nodeType&&exports,vt=vt[typeof module]&&module&&!module.nodeType&&module,bt=dt&&vt&&typeof global=="object"&&global; +!bt||bt.global!==bt&&bt.window!==bt&&bt.self!==bt||(mt=bt);var bt=vt&&vt.exports===dt&&dt,_t=_();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(mt._=_t, define(function(){return _t})):dt&&vt?bt?(vt.exports=_t)._=_t:dt._=_t:mt._=_t}).call(this); \ No newline at end of file diff --git a/dist/lodash.js b/dist/lodash.js index 8f7410aff..13e2d775b 100644 --- a/dist/lodash.js +++ b/dist/lodash.js @@ -444,16 +444,6 @@ return '\\' + stringEscapes[chr]; } - /** - * Used by `_.partition` to create partitioned arrays. - * - * @private - * @returns {Array} Returns the new array. - */ - function partitionInitializer() { - return [[], []]; - } - /** * A fallback implementation of `String#trim` to remove leading and trailing * whitespace or specified characters from `string`. @@ -3516,23 +3506,14 @@ function contains(collection, target, fromIndex) { var length = collection ? collection.length : 0; if (!(typeof length == 'number' && length > -1 && length <= maxSafeInteger)) { - var props = keys(collection); - length = props.length; + collection = values(collection); + length = collection.length; } if (typeof fromIndex == 'number') { fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : (fromIndex || 0); } else { fromIndex = 0; } - if (props) { - while (fromIndex < length) { - var value = collection[props[fromIndex++]]; - if (value === target) { - return true; - } - } - return false; - } if (typeof collection == 'string' || !isArray(collection) && isString(collection)) { if (fromIndex >= length) { return false; @@ -4222,7 +4203,7 @@ */ var partition = createAggregator(function(result, value, key) { result[key ? 0 : 1].push(value); - }, partitionInitializer); + }, function() { return [[], []]; }); /** * Retrieves the value of a specified property from all elements in the collection. diff --git a/dist/lodash.min.js b/dist/lodash.min.js index fe8699189..d2233361d 100644 --- a/dist/lodash.min.js +++ b/dist/lodash.min.js @@ -4,62 +4,62 @@ * Build: `lodash modern -o ./dist/lodash.js` */ ;(function(){function n(n,t){return typeof n=="undefined"?t:n}function t(n,t){if(n!==t){if(n>t||typeof n=="undefined")return 1;if(nr||13r||8202e||13e||8202>>0:0,u=Re(r);++ei(t,l)&&f.push(l);return f}function st(n,t){var e=-1,r=n?n.length:0;if(typeof r=="number"&&-1a(p,h)&&((u||f)&&p.push(h),c.push(s))}return c}function At(n,t){for(var e=-1,r=t(n),u=r.length,o=Re(u);++ei?0:i)}function zt(n,t,r){var u=n?n.length:0;if(typeof r=="number")r=0>r?hr(u+r,0):r||0;else if(r)return r=Zt(n,t),u&&n[r]===t?r:-1;return e(n,t,r) -}function Dt(n,t,e){var r=n?n.length:0;if(typeof t!="number"&&null!=t){var u=r,i=0;for(t=o.createCallback(t,e,3);u--&&t(n[u],u,n);)i++}else i=null==t||e?1:t;return i=r-(i||0),Ut(n,0,0>i?0:i)}function Bt(n,t,e){var r=n?n.length:0;if(typeof t!="number"&&null!=t){var u=r,i=0;for(t=o.createCallback(t,e,3);u--&&t(n[u],u,n);)i++}else if(i=t,null==i||e)return n?n[r-1]:w;return i=r-(i||0),Ut(n,0>i?0:i)}function qt(n,t,e){if(typeof t!="number"&&null!=t){var r=-1,u=n?n.length:0,i=0;for(t=o.createCallback(t,e,3);++rt?0:t;return Ut(n,i)}function Ut(n,t,e){var r=-1,u=n?n.length:0;for(t=typeof t=="undefined"?0:+t||0,0>t?t=hr(u+t,0):t>u&&(t=u),e=typeof e=="undefined"?u:+e||0,0>e?e=hr(u+e,0):e>u&&(e=u),u=t>e?0:e-t,e=Re(u);++r>>1,e(n[r])e?0:e);++t=r||r>Ke)var u=Sr(n),r=u.length;if(e=typeof e=="number"?0>e?hr(r+e,0):e||0:0,u){for(;ei&&(i=l)}else t=null==t&&de(n)?u:o.createCallback(t,e,3),st(n,function(n,e,u){e=t(n,e,u),e>r&&(r=e,i=n)});return i}function ee(n,t,e,r){var u=3>arguments.length;t=o.createCallback(t,r,4);var i=-1,a=n?n.length:0;if(typeof a=="number"&&-1arguments.length;return t=o.createCallback(t,r,4),ht(n,function(n,r,o){e=u?(u=false,n):t(e,n,r,o)}),e}function ue(n){var t=-1,e=n&&n.length,r=Re(0>e?0:e>>>0);return st(n,function(n){var e=Ct(0,++t);r[t]=r[e],r[e]=n}),r}function oe(n,t,e){var r;t=o.createCallback(t,e,3),e=-1;var u=n?n.length:0;if(typeof u=="number"&&-1arguments.length)return Nt(n,x,null,t); -if(n)var e=n[I]?n[I][2]:n.length,r=Ut(arguments,2),e=e-r.length;return Nt(n,x|O,e,t,r)}function ae(n,t,e){var r,u,o,i,a,l,f,c=0,p=false,s=true;if(!ge(n))throw new De;if(t=0>t?0:t,true===e)var h=true,s=false;else ve(e)&&(h=e.leading,p="maxWait"in e&&hr(t,+e.maxWait||0),s="trailing"in e?e.trailing:s);var g=function(){var e=t-(Dr()-i);0>=e||e>t?(u&&Xe(u),e=f,u=l=f=w,e&&(c=Dr(),o=n.apply(a,r),l||u||(r=a=null))):l=rr(g,e)},v=function(){l&&Xe(l),u=l=f=w,(s||p!==t)&&(c=Dr(),o=n.apply(a,r),l||u||(r=a=null))};return function(){if(r=arguments,i=Dr(),a=this,f=s&&(l||!h),false===p)var e=h&&!l; -else{u||h||(c=i);var y=p-(i-c),m=0>=y||y>p;m?(u&&(u=Xe(u)),c=i,o=n.apply(a,r)):u||(u=rr(v,y))}return m&&l?l=Xe(l):l||t===p||(l=rr(g,t)),e&&(m=true,o=n.apply(a,r)),!m||l||u||(r=a=null),o}}function le(n){if(!ge(n))throw new De;return function(){return!n.apply(this,arguments)}}function fe(n,t,e){var r=arguments;if(!n||2>r.length)return n;var u=0,o=r.length,i=typeof e;if("number"!=i&&"string"!=i||!r[3]||r[3][e]!==t||(o=2),3arguments.length)return t;var e=Ut(arguments);return e.push(n),fe.apply(null,e)}function pe(n){var t=[];return _t(n,function(n,e){ge(n)&&t.push(e)}),t.sort()}function se(n){return n&&typeof n=="object"&&typeof n.length=="number"&&Me.call(n)==H||false}function he(n){return n&&typeof n=="object"&&1===n.nodeType&&-1>>0,r=-1,u=e-1,o=Re(e),i=0t||null==n||!cr(t))return e;n=ze(n);do t%2&&(e+=n),t=Ye(t/2),n+=n;while(t);return e}function je(n,t,e){var r=typeof n;return"function"==r||null==n?(typeof t=="undefined"||!("prototype"in n))&&n||X(n,t,e):"object"!=r?Ie(n):Oe(n) -}function Ce(n){return n}function Oe(n){var t=Sr(n),e=t.length,r=t[0],u=e&&n[r];return 1!=e||u!==u||ve(u)?function(r){var u=e;if(u&&!r)return false;for(var o=true;u--&&(o=t[u],o=Qe.call(r,o)&&kt(r[o],n[o],null,true)););return o}:function(n){return n&&Qe.call(n,r)?(n=n[r],u===n&&(0!==u||1/u==1/n)):false}}function Ae(n,t,e){var r=true,u=t&&pe(t);t&&(e||u.length)||(null==e&&(e=t),t=n,n=o,u=pe(t)),false===e?r=false:ve(e)&&"chain"in e&&(r=e.chain),e=-1;for(var i=ge(n),a=u?u.length:0;++e--n?t.apply(this,arguments):void 0}},o.assign=fe,o.at=function(n,t){var e=arguments,r=-1,u=yt(e,true,false,1),o=u.length,i=typeof t;for("number"!=i&&"string"!=i||!e[2]||e[2][t]!==n||(o=1),e=Re(o);++rarguments.length?Nt(t,x|k,null,n):Nt(t,x|k|O,null,n,Ut(arguments,2))},o.chain=function(n){return new i(n,true)},o.compact=function(n){for(var t=-1,e=n?n.length:0,r=0,u=[];++t(s?r(s,l):i(p,l))){for(t=u;--t;){var h=o[t];if(0>(h?r(h,l):i(n[t],l)))continue n}s&&s.push(l),p.push(l)}return p},o.invert=function(n,t){for(var e=-1,r=Sr(n),u=r.length,o={};++eo?0:o>>>0); -return st(n,function(n){var o=u?t:null!=n&&n[t];i[++r]=o?o.apply(n,e):w}),i},o.keys=Sr,o.keysIn=be,o.map=ne,o.mapValues=function(n,t,e){var r={};return t=o.createCallback(t,e,3),wt(n,function(n,e,u){r[e]=t(n,e,u)}),r},o.matches=Oe,o.max=te,o.memoize=function(n,t){if(!ge(n))throw new De;var e=function(){var r=e.cache,u=t?t.apply(this,arguments):"_"+arguments[0];return Qe.call(r,u)?r[u]:r[u]=n.apply(this,arguments)};return e.cache={},e},o.merge=function(n,t,e){if(!n)return n;var r=arguments,u=r.length,o=typeof e; -if("number"!=o&&"string"!=o||!r[3]||r[3][e]!==t||(u=2),3u?0:u>>>0);for(i||(t=o.createCallback(t,e,3)),st(n,function(n,e,u){if(i)for(e=t.length,u=Re(e);e--;)u[e]=n[t[e]];else u=t(n,e,u);f[++r]={a:u,b:r,c:n}}),u=f.length,f.sort(i?l:a);u--;)f[u]=f[u].c;return f},o.tap=function(n,t,e){return t.call(e,n),n},o.throttle=function(n,t,e){var r=true,u=true;if(!ge(n))throw new De; -return false===e?r=false:ve(e)&&(r="leading"in e?!!e.leading:r,u="trailing"in e?!!e.trailing:u),lt.leading=r,lt.maxWait=+t,lt.trailing=u,ae(n,t,lt)},o.times=function(n,t,e){n=0>n?0:n>>>0,t=X(t,e,1),e=-1;for(var r=Re(n);++ee?0:+e||0,r))-t.length,0<=e&&n.indexOf(t,e)==e},o.escape=function(n){return null==n?"":ze(n).replace($,p)},o.escapeRegExp=xe,o.every=Xt,o.find=Gt,o.findIndex=$t,o.findKey=function(n,t,e){return t=o.createCallback(t,e,3),gt(n,t,wt,true) -},o.findLast=function(n,t,e){return t=o.createCallback(t,e,3),gt(n,t,ht)},o.findLastIndex=function(n,t,e){var r=n?n.length:0;for(t=o.createCallback(t,e,3);r--;)if(t(n[r],r,n))return r;return-1},o.findLastKey=function(n,t,e){return t=o.createCallback(t,e,3),gt(n,t,xt,true)},o.has=function(n,t){return n?Qe.call(n,t):false},o.identity=Ce,o.indexOf=zt,o.isArguments=se,o.isArray=Rr,o.isBoolean=function(n){return true===n||false===n||n&&typeof n=="object"&&Me.call(n)==nt||false},o.isDate=function(n){return n&&typeof n=="object"&&Me.call(n)==tt||false -},o.isElement=he,o.isEmpty=function(n){var t=true;if(!n)return t;var e=Me.call(n),r=n.length;return-1e?hr(r+e,0):gr(e||0,r-1))+1);r--;)if(n[r]===t)return r;return-1},o.mixin=Ae,o.noConflict=function(){return t._=Pe,this},o.noop=Ee,o.now=Dr,o.pad=function(n,t,e){n=null==n?"":ze(n),t=+t;var r=n.length;return re?0:+e||0,n.length),n.lastIndexOf(t,e)==e},o.template=function(n,t,e){var r=o.templateSettings;e=ce({},e,r),n=ze(null==n?"":n);var u,i,a=ce({},e.imports,r.imports),r=Sr(a),a=we(a),l=0,f=e.interpolate||K,c="__p+='",f=Le((e.escape||K).source+"|"+f.source+"|"+(f===D?B:K).source+"|"+(e.evaluate||K).source+"|$","g"); -n.replace(f,function(t,e,r,o,a,f){return r||(r=o),c+=n.slice(l,f).replace(J,s),e&&(u=true,c+="'+__e("+e+")+'"),a&&(i=true,c+="';"+a+";\n__p+='"),r&&(c+="'+((__t=("+r+"))==null?'':__t)+'"),l=f+t.length,t}),c+="';",(e=e.variable)||(c="with(obj){"+c+"}"),c=(i?c.replace(S,""):c).replace(T,"$1").replace(W,"$1;"),c="function("+(e||"obj")+"){"+(e?"":"obj||(obj={});")+"var __t,__p=''"+(u?",__e=_.escape":"")+(i?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+c+"return __p}";try{var p=Te(r,"return "+c).apply(w,a) -}catch(h){throw h.source=c,h}return t?p(t):(p.source=c,p)},o.trim=$r,o.trimLeft=Lr,o.trimRight=zr,o.truncate=function(n,t){var e=30,r="...";if(t&&ve(t))var u="separator"in t?t.separator:u,e="length"in t?+t.length||0:e,r="omission"in t?ze(t.omission):r;else null!=t&&(e=+t||0);if(n=null==n?"":ze(n),e>=n.length)return n;var o=e-r.length;if(1>o)return r;if(e=n.slice(0,o),null==u)return e+r;if(me(u)){if(n.slice(o).search(u)){var i,a,l=n.slice(0,o);for(u.global||(u=Le(u.source,(q.exec(u)||"")+"g")),u.lastIndex=0;i=u.exec(l);)a=i.index; -e=e.slice(0,null==a?o:a)}}else n.indexOf(u,o)!=o&&(u=e.lastIndexOf(u),-1n.indexOf(";")?n:n.replace(F,b))},o.uniqueId=function(n){var t=++R;return ze(null==n?"":n)+t},o.all=Xt,o.any=oe,o.detect=Gt,o.findWhere=Gt,o.foldl=ee,o.foldr=re,o.include=Jt,o.inject=ee,Ae(function(){var n={};return wt(o,function(t,e){o.prototype[e]||(n[e]=t)}),n}(),false),o.first=Lt,o.last=Bt,o.sample=function(n,t,e){return n&&typeof n.length!="number"&&(n=we(n)),null==t||e?(t=n?n.length:0,0t?0:+t||0,n.length),n) -},o.take=Lt,o.takeRight=Bt,o.takeRightWhile=Bt,o.takeWhile=Lt,o.head=Lt,wt(o,function(n,t){var e="sample"!==t;o.prototype[t]||(o.prototype[t]=function(t,r){var u=this.__chain__,o=n(this.__wrapped__,t,r);return u||null!=t&&(!r||e&&typeof t=="function")?new i(o,u):o})}),o.VERSION=E,o.prototype.chain=function(){return this.__chain__=true,this},o.prototype.toJSON=Vt,o.prototype.toString=function(){return ze(this.__wrapped__)},o.prototype.value=Vt,o.prototype.valueOf=Vt,st(["join","pop","shift"],function(n){var t=Be[n]; -o.prototype[n]=function(){var n=this.__chain__,e=t.apply(this.__wrapped__,arguments);return n?new i(e,n):e}}),st(["push","reverse","sort","unshift"],function(n){var t=Be[n];o.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),st(["concat","splice"],function(n){var t=Be[n];o.prototype[n]=function(){return new i(t.apply(this.__wrapped__,arguments),this.__chain__)}}),o}var w,x=1,k=2,j=4,C=8,O=16,A=32,E="2.4.1",I="__lodash@"+E+"__",R=0,N=/^[A-Z]+$/,S=/\b__p\+='';/g,T=/\b(__p\+=)''\+/g,W=/(__e\(.*?\)|\b__t\))\+'';/g,F=/&(?:amp|lt|gt|quot|#39);/g,$=/[&<>"']/g,L=/<%-([\s\S]+?)%>/g,z=/<%([\s\S]+?)%>/g,D=/<%=([\s\S]+?)%>/g,B=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,q=/\w*$/,U=/^\s*function[ \n\r\t]+\w/,Z=/^0[xX]/,P=/[\xC0-\xFF]/g,K=/($^)/,M=/[.*+?^${}()|[\]\\]/g,V=/\bthis\b/,J=/['\n\r\u2028\u2029\\]/g,X=/[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[a-z]+|[0-9]+/g,Y=" \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",G="Array Boolean Date Function Math Number Object RegExp Set String _ clearTimeout document isFinite isNaN parseInt setTimeout TypeError window WinRTError".split(" "),H="[object Arguments]",Q="[object Array]",nt="[object Boolean]",tt="[object Date]",et="[object Function]",rt="[object Number]",ut="[object Object]",ot="[object RegExp]",it="[object String]",at={}; -at[et]=false,at[H]=at[Q]=at[nt]=at[tt]=at[rt]=at[ut]=at[ot]=at[it]=true;var lt={leading:false,maxWait:0,trailing:false},ft={configurable:false,enumerable:false,value:null,writable:false},ct={"&":"&","<":"<",">":">",'"':""","'":"'"},pt={"&":"&","<":"<",">":">",""":'"',"'":"'"},st={\u00c0:"A",\u00c1:"A",\u00c2:"A",\u00c3:"A",\u00c4:"A",\u00c5:"A",\u00e0:"a",\u00e1:"a",\u00e2:"a",\u00e3:"a",\u00e4:"a",\u00e5:"a",\u00c7:"C",\u00e7:"c",\u00d0:"D",\u00f0:"d",\u00c8:"E",\u00c9:"E",\u00ca:"E",\u00cb:"E",\u00e8:"e",\u00e9:"e",\u00ea:"e",\u00eb:"e",\u00cc:"I",\u00cd:"I",\u00ce:"I",\u00cf:"I",\u00ec:"i",\u00ed:"i",\u00ee:"i",\u00ef:"i",\u00d1:"N",\u00f1:"n",\u00d2:"O",\u00d3:"O",\u00d4:"O",\u00d5:"O",\u00d6:"O",\u00d8:"O",\u00f2:"o",\u00f3:"o",\u00f4:"o",\u00f5:"o",\u00f6:"o",\u00f8:"o",\u00d9:"U",\u00da:"U",\u00db:"U",\u00dc:"U",\u00f9:"u",\u00fa:"u",\u00fb:"u",\u00fc:"u",\u00dd:"Y",\u00fd:"y",\u00ff:"y",\u00c6:"AE",\u00e6:"ae",\u00de:"Th",\u00fe:"th",\u00df:"ss","\xd7":" ","\xf7":" "},ht={"function":true,object:true},gt={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},vt=ht[typeof window]&&window||this,yt=ht[typeof exports]&&exports&&!exports.nodeType&&exports,ht=ht[typeof module]&&module&&!module.nodeType&&module,mt=yt&&ht&&typeof global=="object"&&global; -!mt||mt.global!==mt&&mt.window!==mt&&mt.self!==mt||(vt=mt);var mt=ht&&ht.exports===yt&&yt,dt=_();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(vt._=dt, define(function(){return dt})):yt&&ht?mt?(ht.exports=dt)._=dt:yt._=dt:vt._=dt}).call(this); \ No newline at end of file +}function l(n,e){for(var r=-1,u=n.a,o=e.a,i=u.length;++rr||13r||8202e||13e||8202>>0:0,u=Ie(r);++ei(t,l)&&f.push(l);return f}function pt(n,t){var e=-1,r=n?n.length:0;if(typeof r=="number"&&-1a(p,h)&&((u||f)&&p.push(h),c.push(s))}return c}function Ot(n,t){for(var e=-1,r=t(n),u=r.length,o=Ie(u);++ei?0:i)}function Lt(n,t,r){var u=n?n.length:0;if(typeof r=="number")r=0>r?sr(u+r,0):r||0;else if(r)return r=Ut(n,t),u&&n[r]===t?r:-1;return e(n,t,r) +}function zt(n,t,e){var r=n?n.length:0;if(typeof t!="number"&&null!=t){var u=r,i=0;for(t=o.createCallback(t,e,3);u--&&t(n[u],u,n);)i++}else i=null==t||e?1:t;return i=r-(i||0),qt(n,0,0>i?0:i)}function Dt(n,t,e){var r=n?n.length:0;if(typeof t!="number"&&null!=t){var u=r,i=0;for(t=o.createCallback(t,e,3);u--&&t(n[u],u,n);)i++}else if(i=t,null==i||e)return n?n[r-1]:_;return i=r-(i||0),qt(n,0>i?0:i)}function Bt(n,t,e){if(typeof t!="number"&&null!=t){var r=-1,u=n?n.length:0,i=0;for(t=o.createCallback(t,e,3);++rt?0:t;return qt(n,i)}function qt(n,t,e){var r=-1,u=n?n.length:0;for(t=typeof t=="undefined"?0:+t||0,0>t?t=sr(u+t,0):t>u&&(t=u),e=typeof e=="undefined"?u:+e||0,0>e?e=sr(u+e,0):e>u&&(e=u),u=t>e?0:e-t,e=Ie(u);++r>>1,e(n[r])e?0:e);++te?sr(r+e,0):e||0:0,typeof n=="string"||!Ir(n)&&me(n)?ei&&(i=l)}else t=null==t&&me(n)?u:o.createCallback(t,e,3),pt(n,function(n,e,u){e=t(n,e,u),e>r&&(r=e,i=n)});return i}function te(n,t,e,r){var u=3>arguments.length;t=o.createCallback(t,r,4);var i=-1,a=n?n.length:0;if(typeof a=="number"&&-1arguments.length;return t=o.createCallback(t,r,4),st(n,function(n,r,o){e=u?(u=false,n):t(e,n,r,o)}),e}function re(n){var t=-1,e=n&&n.length,r=Ie(0>e?0:e>>>0);return pt(n,function(n){var e=jt(0,++t);r[t]=r[e],r[e]=n}),r}function ue(n,t,e){var r;t=o.createCallback(t,e,3),e=-1;var u=n?n.length:0;if(typeof u=="number"&&-1arguments.length)return Rt(n,w,null,t); +if(n)var e=n[E]?n[E][2]:n.length,r=qt(arguments,2),e=e-r.length;return Rt(n,w|C,e,t,r)}function ie(n,t,e){var r,u,o,i,a,l,f,c=0,p=false,s=true;if(!he(n))throw new ze;if(t=0>t?0:t,true===e)var h=true,s=false;else ge(e)&&(h=e.leading,p="maxWait"in e&&sr(t,+e.maxWait||0),s="trailing"in e?e.trailing:s);var g=function(){var e=t-(zr()-i);0>=e||e>t?(u&&Je(u),e=f,u=l=f=_,e&&(c=zr(),o=n.apply(a,r),l||u||(r=a=null))):l=er(g,e)},v=function(){l&&Je(l),u=l=f=_,(s||p!==t)&&(c=zr(),o=n.apply(a,r),l||u||(r=a=null))};return function(){if(r=arguments,i=zr(),a=this,f=s&&(l||!h),false===p)var e=h&&!l; +else{u||h||(c=i);var y=p-(i-c),m=0>=y||y>p;m?(u&&(u=Je(u)),c=i,o=n.apply(a,r)):u||(u=er(v,y))}return m&&l?l=Je(l):l||t===p||(l=er(g,t)),e&&(m=true,o=n.apply(a,r)),!m||l||u||(r=a=null),o}}function ae(n){if(!he(n))throw new ze;return function(){return!n.apply(this,arguments)}}function le(n,t,e){var r=arguments;if(!n||2>r.length)return n;var u=0,o=r.length,i=typeof e;if("number"!=i&&"string"!=i||!r[3]||r[3][e]!==t||(o=2),3arguments.length)return t;var e=qt(arguments);return e.push(n),le.apply(null,e)}function ce(n){var t=[];return bt(n,function(n,e){he(n)&&t.push(e)}),t.sort()}function pe(n){return n&&typeof n=="object"&&typeof n.length=="number"&&Ke.call(n)==G||false}function se(n){return n&&typeof n=="object"&&1===n.nodeType&&-1>>0,r=-1,u=e-1,o=Ie(e),i=0t||null==n||!fr(t))return e;n=Le(n);do t%2&&(e+=n),t=Xe(t/2),n+=n;while(t);return e}function ke(n,t,e){var r=typeof n;return"function"==r||null==n?(typeof t=="undefined"||!("prototype"in n))&&n||J(n,t,e):"object"!=r?Ee(n):Ce(n) +}function je(n){return n}function Ce(n){var t=Nr(n),e=t.length,r=t[0],u=e&&n[r];return 1!=e||u!==u||ge(u)?function(r){var u=e;if(u&&!r)return false;for(var o=true;u--&&(o=t[u],o=He.call(r,o)&&xt(r[o],n[o],null,true)););return o}:function(n){return n&&He.call(n,r)?(n=n[r],u===n&&(0!==u||1/u==1/n)):false}}function Oe(n,t,e){var r=true,u=t&&ce(t);t&&(e||u.length)||(null==e&&(e=t),t=n,n=o,u=ce(t)),false===e?r=false:ge(e)&&"chain"in e&&(r=e.chain),e=-1;for(var i=he(n),a=u?u.length:0;++e--n?t.apply(this,arguments):void 0}},o.assign=le,o.at=function(n,t){var e=arguments,r=-1,u=vt(e,true,false,1),o=u.length,i=typeof t;for("number"!=i&&"string"!=i||!e[2]||e[2][t]!==n||(o=1),e=Ie(o);++rarguments.length?Rt(t,w|x,null,n):Rt(t,w|x|C,null,n,qt(arguments,2))},o.chain=function(n){return new i(n,true)},o.compact=function(n){for(var t=-1,e=n?n.length:0,r=0,u=[];++t(s?r(s,l):i(p,l))){for(t=u;--t;){var h=o[t];if(0>(h?r(h,l):i(n[t],l)))continue n}s&&s.push(l),p.push(l)}return p},o.invert=function(n,t){for(var e=-1,r=Nr(n),u=r.length,o={};++eo?0:o>>>0); +return pt(n,function(n){var o=u?t:null!=n&&n[t];i[++r]=o?o.apply(n,e):_}),i},o.keys=Nr,o.keysIn=de,o.map=Qt,o.mapValues=function(n,t,e){var r={};return t=o.createCallback(t,e,3),_t(n,function(n,e,u){r[e]=t(n,e,u)}),r},o.matches=Ce,o.max=ne,o.memoize=function(n,t){if(!he(n))throw new ze;var e=function(){var r=e.cache,u=t?t.apply(this,arguments):"_"+arguments[0];return He.call(r,u)?r[u]:r[u]=n.apply(this,arguments)};return e.cache={},e},o.merge=function(n,t,e){if(!n)return n;var r=arguments,u=r.length,o=typeof e; +if("number"!=o&&"string"!=o||!r[3]||r[3][e]!==t||(u=2),3u?0:u>>>0);for(i||(t=o.createCallback(t,e,3)),pt(n,function(n,e,u){if(i)for(e=t.length,u=Ie(e);e--;)u[e]=n[t[e]];else u=t(n,e,u);f[++r]={a:u,b:r,c:n}}),u=f.length,f.sort(i?l:a);u--;)f[u]=f[u].c;return f},o.tap=function(n,t,e){return t.call(e,n),n},o.throttle=function(n,t,e){var r=true,u=true;if(!he(n))throw new ze; +return false===e?r=false:ge(e)&&(r="leading"in e?!!e.leading:r,u="trailing"in e?!!e.trailing:u),at.leading=r,at.maxWait=+t,at.trailing=u,ie(n,t,at)},o.times=function(n,t,e){n=0>n?0:n>>>0,t=J(t,e,1),e=-1;for(var r=Ie(n);++ee?0:+e||0,r))-t.length,0<=e&&n.indexOf(t,e)==e},o.escape=function(n){return null==n?"":Le(n).replace(F,p)},o.escapeRegExp=we,o.every=Jt,o.find=Yt,o.findIndex=Ft,o.findKey=function(n,t,e){return t=o.createCallback(t,e,3),ht(n,t,_t,true) +},o.findLast=function(n,t,e){return t=o.createCallback(t,e,3),ht(n,t,st)},o.findLastIndex=function(n,t,e){var r=n?n.length:0;for(t=o.createCallback(t,e,3);r--;)if(t(n[r],r,n))return r;return-1},o.findLastKey=function(n,t,e){return t=o.createCallback(t,e,3),ht(n,t,wt,true)},o.has=function(n,t){return n?He.call(n,t):false},o.identity=je,o.indexOf=Lt,o.isArguments=pe,o.isArray=Ir,o.isBoolean=function(n){return true===n||false===n||n&&typeof n=="object"&&Ke.call(n)==Q||false},o.isDate=function(n){return n&&typeof n=="object"&&Ke.call(n)==nt||false +},o.isElement=se,o.isEmpty=function(n){var t=true;if(!n)return t;var e=Ke.call(n),r=n.length;return-1e?sr(r+e,0):hr(e||0,r-1))+1);r--;)if(n[r]===t)return r;return-1},o.mixin=Oe,o.noConflict=function(){return t._=Ze,this},o.noop=Ae,o.now=zr,o.pad=function(n,t,e){n=null==n?"":Le(n),t=+t;var r=n.length;return re?0:+e||0,n.length),n.lastIndexOf(t,e)==e},o.template=function(n,t,e){var r=o.templateSettings;e=fe({},e,r),n=Le(null==n?"":n);var u,i,a=fe({},e.imports,r.imports),r=Nr(a),a=_e(a),l=0,f=e.interpolate||P,c="__p+='",f=$e((e.escape||P).source+"|"+f.source+"|"+(f===z?D:P).source+"|"+(e.evaluate||P).source+"|$","g"); +n.replace(f,function(t,e,r,o,a,f){return r||(r=o),c+=n.slice(l,f).replace(V,s),e&&(u=true,c+="'+__e("+e+")+'"),a&&(i=true,c+="';"+a+";\n__p+='"),r&&(c+="'+((__t=("+r+"))==null?'':__t)+'"),l=f+t.length,t}),c+="';",(e=e.variable)||(c="with(obj){"+c+"}"),c=(i?c.replace(N,""):c).replace(S,"$1").replace(T,"$1;"),c="function("+(e||"obj")+"){"+(e?"":"obj||(obj={});")+"var __t,__p=''"+(u?",__e=_.escape":"")+(i?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+c+"return __p}";try{var p=Se(r,"return "+c).apply(_,a) +}catch(h){throw h.source=c,h}return t?p(t):(p.source=c,p)},o.trim=Fr,o.trimLeft=$r,o.trimRight=Lr,o.truncate=function(n,t){var e=30,r="...";if(t&&ge(t))var u="separator"in t?t.separator:u,e="length"in t?+t.length||0:e,r="omission"in t?Le(t.omission):r;else null!=t&&(e=+t||0);if(n=null==n?"":Le(n),e>=n.length)return n;var o=e-r.length;if(1>o)return r;if(e=n.slice(0,o),null==u)return e+r;if(ye(u)){if(n.slice(o).search(u)){var i,a,l=n.slice(0,o);for(u.global||(u=$e(u.source,(B.exec(u)||"")+"g")),u.lastIndex=0;i=u.exec(l);)a=i.index; +e=e.slice(0,null==a?o:a)}}else n.indexOf(u,o)!=o&&(u=e.lastIndexOf(u),-1n.indexOf(";")?n:n.replace(W,d))},o.uniqueId=function(n){var t=++I;return Le(null==n?"":n)+t},o.all=Jt,o.any=ue,o.detect=Yt,o.findWhere=Yt,o.foldl=te,o.foldr=ee,o.include=Vt,o.inject=te,Oe(function(){var n={};return _t(o,function(t,e){o.prototype[e]||(n[e]=t)}),n}(),false),o.first=$t,o.last=Dt,o.sample=function(n,t,e){return n&&typeof n.length!="number"&&(n=_e(n)),null==t||e?(t=n?n.length:0,0t?0:+t||0,n.length),n) +},o.take=$t,o.takeRight=Dt,o.takeRightWhile=Dt,o.takeWhile=$t,o.head=$t,_t(o,function(n,t){var e="sample"!==t;o.prototype[t]||(o.prototype[t]=function(t,r){var u=this.__chain__,o=n(this.__wrapped__,t,r);return u||null!=t&&(!r||e&&typeof t=="function")?new i(o,u):o})}),o.VERSION=A,o.prototype.chain=function(){return this.__chain__=true,this},o.prototype.toJSON=Mt,o.prototype.toString=function(){return Le(this.__wrapped__)},o.prototype.value=Mt,o.prototype.valueOf=Mt,pt(["join","pop","shift"],function(n){var t=De[n]; +o.prototype[n]=function(){var n=this.__chain__,e=t.apply(this.__wrapped__,arguments);return n?new i(e,n):e}}),pt(["push","reverse","sort","unshift"],function(n){var t=De[n];o.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),pt(["concat","splice"],function(n){var t=De[n];o.prototype[n]=function(){return new i(t.apply(this.__wrapped__,arguments),this.__chain__)}}),o}var _,w=1,x=2,k=4,j=8,C=16,O=32,A="2.4.1",E="__lodash@"+A+"__",I=0,R=/^[A-Z]+$/,N=/\b__p\+='';/g,S=/\b(__p\+=)''\+/g,T=/(__e\(.*?\)|\b__t\))\+'';/g,W=/&(?:amp|lt|gt|quot|#39);/g,F=/[&<>"']/g,$=/<%-([\s\S]+?)%>/g,L=/<%([\s\S]+?)%>/g,z=/<%=([\s\S]+?)%>/g,D=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,B=/\w*$/,q=/^\s*function[ \n\r\t]+\w/,U=/^0[xX]/,Z=/[\xC0-\xFF]/g,P=/($^)/,K=/[.*+?^${}()|[\]\\]/g,M=/\bthis\b/,V=/['\n\r\u2028\u2029\\]/g,J=/[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[a-z]+|[0-9]+/g,X=" \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",Y="Array Boolean Date Function Math Number Object RegExp Set String _ clearTimeout document isFinite isNaN parseInt setTimeout TypeError window WinRTError".split(" "),G="[object Arguments]",H="[object Array]",Q="[object Boolean]",nt="[object Date]",tt="[object Function]",et="[object Number]",rt="[object Object]",ut="[object RegExp]",ot="[object String]",it={}; +it[tt]=false,it[G]=it[H]=it[Q]=it[nt]=it[et]=it[rt]=it[ut]=it[ot]=true;var at={leading:false,maxWait:0,trailing:false},lt={configurable:false,enumerable:false,value:null,writable:false},ft={"&":"&","<":"<",">":">",'"':""","'":"'"},ct={"&":"&","<":"<",">":">",""":'"',"'":"'"},pt={\u00c0:"A",\u00c1:"A",\u00c2:"A",\u00c3:"A",\u00c4:"A",\u00c5:"A",\u00e0:"a",\u00e1:"a",\u00e2:"a",\u00e3:"a",\u00e4:"a",\u00e5:"a",\u00c7:"C",\u00e7:"c",\u00d0:"D",\u00f0:"d",\u00c8:"E",\u00c9:"E",\u00ca:"E",\u00cb:"E",\u00e8:"e",\u00e9:"e",\u00ea:"e",\u00eb:"e",\u00cc:"I",\u00cd:"I",\u00ce:"I",\u00cf:"I",\u00ec:"i",\u00ed:"i",\u00ee:"i",\u00ef:"i",\u00d1:"N",\u00f1:"n",\u00d2:"O",\u00d3:"O",\u00d4:"O",\u00d5:"O",\u00d6:"O",\u00d8:"O",\u00f2:"o",\u00f3:"o",\u00f4:"o",\u00f5:"o",\u00f6:"o",\u00f8:"o",\u00d9:"U",\u00da:"U",\u00db:"U",\u00dc:"U",\u00f9:"u",\u00fa:"u",\u00fb:"u",\u00fc:"u",\u00dd:"Y",\u00fd:"y",\u00ff:"y",\u00c6:"AE",\u00e6:"ae",\u00de:"Th",\u00fe:"th",\u00df:"ss","\xd7":" ","\xf7":" "},st={"function":true,object:true},ht={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},gt=st[typeof window]&&window||this,vt=st[typeof exports]&&exports&&!exports.nodeType&&exports,st=st[typeof module]&&module&&!module.nodeType&&module,yt=vt&&st&&typeof global=="object"&&global; +!yt||yt.global!==yt&&yt.window!==yt&&yt.self!==yt||(gt=yt);var yt=st&&st.exports===vt&&vt,mt=b();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(gt._=mt, define(function(){return mt})):vt&&st?yt?(st.exports=mt)._=mt:vt._=mt:gt._=mt}).call(this); \ No newline at end of file diff --git a/dist/lodash.underscore.js b/dist/lodash.underscore.js index 75509ed18..65e5ff8d5 100644 --- a/dist/lodash.underscore.js +++ b/dist/lodash.underscore.js @@ -205,16 +205,6 @@ return '\\' + stringEscapes[chr]; } - /** - * Used by `_.partition` to create partitioned arrays. - * - * @private - * @returns {Array} Returns the new array. - */ - function partitionInitializer() { - return [[], []]; - } - /** * Used by `_.unescape` to convert HTML entities to characters. * @@ -2034,21 +2024,13 @@ * // => true */ function contains(collection, target) { - var length = collection ? collection.length : 0; - if (typeof length == 'number' && length > -1 && length <= maxSafeInteger) { - var indexOf = getIndexOf(); - return indexOf(collection, target) > -1; - } - var props = keys(collection); - length = props.length; + var indexOf = getIndexOf(), + length = collection ? collection.length : 0; - while (length--) { - var value = collection[props[length]]; - if (value === target) { - return true; - } + if (!(typeof length == 'number' && length > -1 && length <= maxSafeInteger)) { + collection = values(collection); } - return false; + return indexOf(collection, target) > -1; } /** @@ -2673,7 +2655,7 @@ */ var partition = createAggregator(function(result, value, key) { result[key ? 0 : 1].push(value); - }, partitionInitializer); + }, function() { return [[], []]; }); /** * Retrieves the value of a specified property from all elements in the collection. diff --git a/dist/lodash.underscore.min.js b/dist/lodash.underscore.min.js index feeb60017..2d5b8d7ad 100644 --- a/dist/lodash.underscore.min.js +++ b/dist/lodash.underscore.min.js @@ -11,16 +11,16 @@ var u=typeof n,i=typeof r;if(n===n&&(null==n||null==r||"function"!=u&&"object"!= }for(t||(t=[]),e||(e=[]),i=t.length;i--;)if(t[i]==n)return e[i]==r;var c=true,l=0;if(t.push(n),e.push(r),u){if(l=r.length,c=l==n.length)for(;l--&&(c=b(n[l],r[l],t,e)););}else m(r,function(r,u,o){return Gr.call(o,u)?(l++,!(c=Gr.call(n,u)&&b(n[u],r,t,e))&&sr):void 0}),c&&m(n,function(n,r,t){return Gr.call(t,r)?!(c=-1<--l)&&sr:void 0});return t.pop(),e.pop(),c}function d(n){return 0+Ur(et()*(n-0+1))}function _(n,r,t){var e=n?n.length:0;if(!e)return[];for(var u=-1,o=x(),i=[],f=t&&!r?[]:i;++uo(f,c)&&(t&&f.push(c),i.push(a))}return i}function w(n,r){return function(t,e,u){var o=r?r():{};e=er(e,u,3),u=-1;var i=t?t.length:0;if(typeof i=="number"&&-1r?0:r)}function O(r,t,e){var u=r?r.length:0;if(typeof e=="number")e=0>e?nt(u+e,0):e||0;else if(e)return e=N(r,t),u&&r[e]===t?e:-1;return n(r,t,e)}function k(n,r,t){return S(n,null==r||t?1:0>r?0:r)}function S(n,r,t){var e=-1,u=n?n.length:0; -for(r=typeof r=="undefined"?0:+r||0,0>r?r=nt(u+r,0):r>u&&(r=u),t=typeof t=="undefined"?u:+t||0,0>t?t=nt(u+t,0):t>u&&(t=u),u=r>t?0:t-r,t=Array(u);++e>>1,t(n[e])u&&(u=t);else r=er(r,t,3),s(n,function(n,t,o){t=r(n,t,o),t>e&&(e=t,u=n)});return u}function W(n,r,t,e){var u=3>arguments.length;r=er(r,e,4);var o=-1,i=n?n.length:0;if(typeof i=="number"&&-1arguments.length;return r=er(r,e,4),g(n,function(n,e,o){t=u?(u=false,n):r(t,n,e,o)}),t}function C(n){var r=-1,t=n&&n.length,e=Array(0>t?0:t>>>0);return s(n,function(n){var t=d(++r);e[r]=e[t],e[t]=n}),e}function P(n,r,t){var e;r=er(r,t,3),t=-1;var u=n?n.length:0;if(typeof u=="number"&&-1arguments.length?j(n,cr,r):j(n,cr|pr,r,S(arguments,2)) -}function V(n,r,t){function e(){l&&clearTimeout(l),i=l=p=ar,(h||g!==r)&&(s=vt(),f=n.apply(c,o),l||i||(o=c=null))}function u(){var t=r-(vt()-a);0>=t||t>r?(i&&clearTimeout(i),t=p,i=l=p=ar,t&&(s=vt(),f=n.apply(c,o),l||i||(o=c=null))):l=setTimeout(u,t)}var o,i,f,a,c,l,p,s=0,g=false,h=true;if(!Q(n))throw new TypeError;if(r=0>r?0:r,true===t)var v=true,h=false;else X(t)&&(v=t.leading,g="maxWait"in t&&nt(r,+t.maxWait||0),h="trailing"in t?t.trailing:h);return function(){if(o=arguments,a=vt(),c=this,p=h&&(l||!v),false===g)var t=v&&!l; -else{i||v||(s=a);var y=g-(a-s),m=0>=y||y>g;m?(i&&(i=clearTimeout(i)),s=a,f=n.apply(c,o)):i||(i=setTimeout(e,y))}return m&&l?l=clearTimeout(l):l||r===g||(l=setTimeout(u,r)),t&&(m=true,f=n.apply(c,o)),!m||l||i||(o=c=null),f}}function G(n){if(!Q(n))throw new TypeError;return function(){return!n.apply(this,arguments)}}function H(n,r,t){if(!n)return n;var e=arguments,u=0,o=e.length,i=typeof t;for("number"!=i&&"string"!=i||!e[3]||e[3][t]!==r||(o=2);++u"']/g,yr=/($^)/,mr=/[.*+?^${}()|[\]\\]/g,br=/['\n\r\u2028\u2029\\]/g,dr="[object Arguments]",_r="[object Array]",wr="[object Boolean]",jr="[object Date]",xr="[object Number]",Tr="[object Object]",Ar="[object RegExp]",Er="[object String]",Or={"&":"&","<":"<",">":">",'"':""","'":"'"},kr={"&":"&","<":"<",">":">",""":'"',"'":"'"},Sr={"function":true,object:true},Nr={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},qr=Sr[typeof window]&&window||this,Fr=Sr[typeof exports]&&exports&&!exports.nodeType&&exports,Br=Sr[typeof module]&&module&&!module.nodeType&&module,Mr=Fr&&Br&&typeof global=="object"&&global; +for(r=typeof r=="undefined"?0:+r||0,0>r?r=nt(u+r,0):r>u&&(r=u),t=typeof t=="undefined"?u:+t||0,0>t?t=nt(u+t,0):t>u&&(t=u),u=r>t?0:t-r,t=Array(u);++e>>1,t(n[e])u&&(u=t);else r=er(r,t,3),s(n,function(n,t,o){t=r(n,t,o),t>e&&(e=t,u=n)});return u}function W(n,r,t,e){var u=3>arguments.length;r=er(r,e,4);var o=-1,i=n?n.length:0;if(typeof i=="number"&&-1arguments.length;return r=er(r,e,4),g(n,function(n,e,o){t=u?(u=false,n):r(t,n,e,o)}),t +}function C(n){var r=-1,t=n&&n.length,e=Array(0>t?0:t>>>0);return s(n,function(n){var t=d(++r);e[r]=e[t],e[t]=n}),e}function P(n,r,t){var e;r=er(r,t,3),t=-1;var u=n?n.length:0;if(typeof u=="number"&&-1arguments.length?j(n,cr,r):j(n,cr|pr,r,S(arguments,2))}function V(n,r,t){function e(){l&&clearTimeout(l),i=l=p=ar,(h||g!==r)&&(s=vt(),f=n.apply(c,o),l||i||(o=c=null))}function u(){var t=r-(vt()-a); +0>=t||t>r?(i&&clearTimeout(i),t=p,i=l=p=ar,t&&(s=vt(),f=n.apply(c,o),l||i||(o=c=null))):l=setTimeout(u,t)}var o,i,f,a,c,l,p,s=0,g=false,h=true;if(!Q(n))throw new TypeError;if(r=0>r?0:r,true===t)var v=true,h=false;else X(t)&&(v=t.leading,g="maxWait"in t&&nt(r,+t.maxWait||0),h="trailing"in t?t.trailing:h);return function(){if(o=arguments,a=vt(),c=this,p=h&&(l||!v),false===g)var t=v&&!l;else{i||v||(s=a);var y=g-(a-s),m=0>=y||y>g;m?(i&&(i=clearTimeout(i)),s=a,f=n.apply(c,o)):i||(i=setTimeout(e,y))}return m&&l?l=clearTimeout(l):l||r===g||(l=setTimeout(u,r)),t&&(m=true,f=n.apply(c,o)),!m||l||i||(o=c=null),f +}}function G(n){if(!Q(n))throw new TypeError;return function(){return!n.apply(this,arguments)}}function H(n,r,t){if(!n)return n;var e=arguments,u=0,o=e.length,i=typeof t;for("number"!=i&&"string"!=i||!e[3]||e[3][t]!==r||(o=2);++u"']/g,yr=/($^)/,mr=/[.*+?^${}()|[\]\\]/g,br=/['\n\r\u2028\u2029\\]/g,dr="[object Arguments]",_r="[object Array]",wr="[object Boolean]",jr="[object Date]",xr="[object Number]",Tr="[object Object]",Ar="[object RegExp]",Er="[object String]",Or={"&":"&","<":"<",">":">",'"':""","'":"'"},kr={"&":"&","<":"<",">":">",""":'"',"'":"'"},Sr={"function":true,object:true},Nr={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},qr=Sr[typeof window]&&window||this,Fr=Sr[typeof exports]&&exports&&!exports.nodeType&&exports,Br=Sr[typeof module]&&module&&!module.nodeType&&module,Mr=Fr&&Br&&typeof global=="object"&&global; !Mr||Mr.global!==Mr&&Mr.window!==Mr&&Mr.self!==Mr||(qr=Mr);var Rr=Br&&Br.exports===Fr&&Fr,$r=Array.prototype,Ir=Object.prototype,Dr=qr._,Wr=Math.pow(2,53)-1,zr=Ir.toString,Cr=RegExp("^"+(null==zr?"":(zr+"").replace(mr,"\\$&")).replace(/toString|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),Pr=Math.ceil,Ur=Math.floor,Vr=Function.prototype.toString,Gr=Ir.hasOwnProperty,Hr=$r.push,Jr=Ir.propertyIsEnumerable,Kr=$r.splice,Lr=T(Lr=Object.create)&&Lr,Qr=T(Qr=Array.isArray)&&Qr,Xr=qr.isFinite,Yr=qr.isNaN,Zr=T(Zr=Object.keys)&&Zr,nt=Math.max,rt=Math.min,tt=T(tt=Date.now)&&tt,et=Math.random; i.prototype=o.prototype;var ut={};!function(){var n={0:1,length:1};ut.spliceObjects=(Kr.call(n,0,1),!n[0])}(0,0),o.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},Lr||(a=function(){function n(){}return function(r){if(X(r)){n.prototype=r;var t=new n;n.prototype=null}return t||qr.Object()}}());var ot=k,it=E,ft=w(function(n,r,t){Gr.call(n,t)?n[t]++:n[t]=1}),at=w(function(n,r,t){Gr.call(n,t)?n[t].push(r):n[t]=[r]}),ct=w(function(n,r,t){n[t]=r }),lt=w(function(n,r,t){n[t?0:1].push(r)},function(){return[[],[]]}),pt=I,st=M;L(arguments)||(L=function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&Gr.call(n,"callee")&&!Jr.call(n,"callee")||false});var gt=Qr||function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&zr.call(n)==_r||false};Q(/x/)&&(Q=function(n){return typeof n=="function"&&"[object Function]"==zr.call(n)});var ht=Zr?function(n){return X(n)?Zr(n):[]}:A,vt=tt||function(){return(new Date).getTime()};o.after=function(n,r){if(!Q(r))throw new TypeError;