From 568faa526f58ef43612ea42313ba64057eac4356 Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Wed, 30 Apr 2014 08:48:37 -0700 Subject: [PATCH] Rebuild dist. --- dist/lodash.compat.js | 67 +++++++++++++------ dist/lodash.compat.min.js | 120 +++++++++++++++++----------------- dist/lodash.js | 67 +++++++++++++------ dist/lodash.min.js | 114 ++++++++++++++++---------------- dist/lodash.underscore.js | 31 ++++----- dist/lodash.underscore.min.js | 4 +- 6 files changed, 227 insertions(+), 176 deletions(-) diff --git a/dist/lodash.compat.js b/dist/lodash.compat.js index 93f0f1d73..989a02a35 100644 --- a/dist/lodash.compat.js +++ b/dist/lodash.compat.js @@ -669,12 +669,12 @@ * `flatten`, `forEach`, `forEachRight`, `forIn`, `forInRight`, `forOwn`, * `forOwnRight`, `functions`, `groupBy`, `indexBy`, `initial`, `intersection`, * `invert`, `invoke`, `keys`, `map`, `mapValues`, `matches`, `max`, `memoize`, - * `merge`, `min`, `noop`, `object`, `omit`, `once`, `pairs`, `partial`, - * `partialRight`, `pick`, `pluck`, `property`, `pull`, `push`, `range`, - * `reject`, `remove`, `rest`, `reverse`, `shuffle`, `slice`, `sort`, `sortBy`, - * `splice`, `tap`, `throttle`, `times`, `toArray`, `transform`, `union`, - * `uniq`, `unshift`, `unzip`, `values`, `where`, `without`, `wrap`, `xor`, - * and `zip` + * `merge`, `min`, `mixin`, `noop`, `object`, `omit`, `once`, `pairs`, + * `partial`, `partialRight`, `pick`, `pluck`, `property`, `pull`, `push`, + * `range`, `reject`, `remove`, `rest`, `reverse`, `shuffle`, `slice`, `sort`, + * `sortBy`, `splice`, `tap`, `throttle`, `times`, `toArray`, `transform`, + * `union`, `uniq`, `unshift`, `unzip`, `values`, `where`, `without`, `wrap`, + * `xor`, and `zip` * * The non-chainable wrapper functions are: * `capitalize`, `clone`, `cloneDeep`, `contains`, `escape`, `every`, `find`, @@ -682,10 +682,10 @@ * `identity`, `indexOf`, `isArguments`, `isArray`, `isBoolean`, `isDate`, * `isElement`, `isEmpty`, `isEqual`, `isFinite`, `isFunction`, `isNaN`, * `isNull`, `isNumber`, `isObject`, `isPlainObject`, `isRegExp`, `isString`, - * `isUndefined`, `join`, `lastIndexOf`, `mixin`, `noConflict`, `now`, - * `parseInt`, `pop`, `random`, `reduce`, `reduceRight`, `result`, `shift`, - * `size`, `some`, `sortedIndex`, `runInContext`, `template`, `trim`, - * `trimLeft`, `trimRight`, `unescape`, `uniqueId`, and `value` + * `isUndefined`, `join`, `lastIndexOf`, `noConflict`, `now`, `parseInt`, + * `pop`, `random`, `reduce`, `reduceRight`, `result`, `shift`, `size`, `some`, + * `sortedIndex`, `runInContext`, `template`, `trim`, `trimLeft`, `trimRight`, + * `unescape`, `uniqueId`, and `value` * * The wrapper functions `first`, `last`, and `sample` return wrapped values * when `n` is provided, otherwise they return unwrapped values. @@ -1295,7 +1295,7 @@ args = composeArgsRight(partialRightArgs, partialRightHolders, args); } if (isCurry) { - var newPartialHolders = []; + var newPartialHolders = getHolders(args); length -= newPartialHolders.length; if (length < arity) { @@ -1721,6 +1721,9 @@ break; } } + if (!result) { + break; + } } else if (!(result = baseIsEqual(value[size], othValue, callback, isWhere, stackA, stackB))) { break; } @@ -2139,10 +2142,10 @@ return createWrapper.apply(null, data); } if (isPartial) { - var partialHolders = []; + var partialHolders = getHolders(partialArgs); } if (isPartialRight) { - var partialRightHolders = []; + var partialRightHolders = getHolders(partialRightArgs); } if (arity == null) { arity = isBindKey ? 0 : func.length; @@ -2156,6 +2159,26 @@ : baseCreateWrapper(data); } + /** + * Finds the indexes of all placeholder elements in `array`. + * + * @private + * @param {Array} array The array to inspect. + * @returns {Array} Returns the new array of placeholder indexes. + */ + function getHolders(array) { + var index = -1, + length = array.length, + result = []; + + while (++index < length) { + if (array[index] === lodash) { + result.push(index); + } + } + return result; + } + /** * Gets the appropriate "indexOf" function. If the `_.indexOf` method is * customized this function returns the custom method, otherwise it returns @@ -3064,17 +3087,17 @@ * // => 2 * * var dict = { - * 'wordToNumber': { 'twenty': 20, 'thirty': 30, 'fourty': 40, 'fifty': 50 } + * 'wordToNumber': { 'twenty': 20, 'thirty': 30, 'forty': 40, 'fifty': 50 } * }; * * // using `callback` - * _.sortedIndex(['twenty', 'thirty', 'fifty'], 'fourty', function(word) { + * _.sortedIndex(['twenty', 'thirty', 'fifty'], 'forty', function(word) { * return dict.wordToNumber[word]; * }); * // => 2 * * // using `callback` with `thisArg` - * _.sortedIndex(['twenty', 'thirty', 'fifty'], 'fourty', function(word) { + * _.sortedIndex(['twenty', 'thirty', 'fifty'], 'forty', function(word) { * return this.wordToNumber[word]; * }, dict); * // => 2 @@ -7860,11 +7883,12 @@ * @static * @memberOf _ * @category Utilities - * @param {Function|Object} [object=lodash] object The destination object. + * @param {Function|Object} [object=this] object The destination object. * @param {Object} source The object of functions to add. * @param {Object} [options] The options object. * @param {boolean} [options.chain=true] Specify whether the functions added * are chainable. + * @returns {Function|Object} Returns `object`. * @example * * function vowels(string) { @@ -7893,7 +7917,7 @@ options = source; } source = object; - object = lodash; + object = this; methodNames = functions(source); } if (options === false) { @@ -7930,6 +7954,7 @@ }(func)); } } + return object; } /** @@ -8302,6 +8327,7 @@ lodash.memoize = memoize; lodash.merge = merge; lodash.min = min; + lodash.mixin = mixin; lodash.negate = negate; lodash.omit = omit; lodash.once = once; @@ -8350,7 +8376,7 @@ lodash.unzip = zip; // add functions to `lodash.prototype` - mixin(assign({}, lodash)); + mixin(lodash, assign({}, lodash)); /*--------------------------------------------------------------------------*/ @@ -8394,7 +8420,6 @@ lodash.isUndefined = isUndefined; lodash.kebabCase = kebabCase; lodash.lastIndexOf = lastIndexOf; - lodash.mixin = mixin; lodash.noConflict = noConflict; lodash.noop = noop; lodash.now = now; @@ -8430,7 +8455,7 @@ lodash.include = contains; lodash.inject = reduce; - mixin(function() { + mixin(lodash, function() { var source = {} baseForOwn(lodash, function(func, methodName) { if (!lodash.prototype[methodName]) { diff --git a/dist/lodash.compat.min.js b/dist/lodash.compat.min.js index 2ea780b0b..b34d68d50 100644 --- a/dist/lodash.compat.min.js +++ b/dist/lodash.compat.min.js @@ -5,65 +5,65 @@ */ ;(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=$r(e);++ri(t,l)&&f.push(l);return f}function bt(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 Nt(n,t){for(var r=-1,e=t(n),u=e.length,o=$r(u);++ro?0:o)}function Ut(n,t,e){var u=n?n.length:0;if(typeof e=="number")e=0>e?xe(u+e,0):e||0;else if(e)return e=Jt(n,t),u&&n[e]===t?e:-1;return r(n,t,e)}function Zt(n,t,r){var e=n?n.length:0;if(typeof t!="number"&&null!=t){var u=e,o=0;for(t=c.createCallback(t,r,3);u--&&t(n[u],u,n);)o++}else o=null==t||r?1:t;return o=e-(o||0),Vt(n,0,0>o?0:o)}function Kt(n,t,r){var e=n?n.length:0;if(typeof t!="number"&&null!=t){var u=e,o=0;for(t=c.createCallback(t,r,3);u--&&t(n[u],u,n);)o++}else if(o=t,null==o||r)return n?n[e-1]:d; -return o=e-(o||0),Vt(n,0>o?0:o)}function Mt(n,t,r){if(typeof t!="number"&&null!=t){var e=-1,u=n?n.length:0,o=0;for(t=c.createCallback(t,r,3);++et?0:t;return Vt(n,o)}function Vt(n,t,r){var e=-1,u=n?n.length:0;for(t=typeof t=="undefined"?0:+t||0,0>t?t=xe(u+t,0):t>u&&(t=u),r=typeof r=="undefined"?u:+r||0,0>r?r=xe(u+r,0):r>u&&(r=u),u=t>r?0:r-t,r=$r(u);++e>>1,r(n[e])r?0:r);++tr?xe(e+r,0):r||0:0,typeof n=="string"||!Fe(n)&&jr(n)?ro&&(o=a)}else t=null==t&&jr(n)?u:c.createCallback(t,r,3),bt(n,function(n,r,u){r=t(n,r,u),(r>e||-1/0===r&&r===o)&&(e=r,o=n)});return o}function ar(n,t){return or(n,Fr(t))}function lr(n,t,r,e){var u=3>arguments.length;if(t=c.createCallback(t,e,4),Fe(n)){var o=-1,i=n.length;for(u&&i&&(r=n[++o]);++oarguments.length;return t=c.createCallback(t,e,4),_t(n,function(n,e,o){r=u?(u=false,n):t(r,n,e,o)}),r}function cr(n){var t=-1,r=n&&n.length,e=$r(0>r?0:r>>>0);return bt(n,function(n){var r=It(0,++t);e[t]=e[r],e[r]=n}),e}function sr(n,t,r){var e;if(t=c.createCallback(t,r,3),Fe(n)){r=-1;for(var u=n.length;++rarguments.length)return Ft(n,b,null,t);if(n)var r=n[O]?n[O][2]:n.length,e=Vt(arguments,2),r=r-e.length; -return Ft(n,b|C,r,t,e)}function gr(n,t,r){var e,u,o,i,a,l,f,c=0,s=false,p=true;if(!_r(n))throw new Vr(E);if(t=0>t?0:t,true===r)var g=true,p=false;else wr(r)&&(g=r.leading,s="maxWait"in r&&xe(t,+r.maxWait||0),p="trailing"in r?r.trailing:p);var h=function(){var r=t-(qe()-i);0>=r||r>t?(u&&ue(u),r=f,u=l=f=d,r&&(c=qe(),o=n.apply(a,e),l||u||(e=a=null))):l=pe(h,r)},v=function(){l&&ue(l),u=l=f=d,(p||s!==t)&&(c=qe(),o=n.apply(a,e),l||u||(e=a=null))};return function(){if(e=arguments,i=qe(),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=ue(u)),c=i,o=n.apply(a,e)):u||(u=pe(v,y))}return m&&l?l=ue(l):l||t===s||(l=pe(h,t)),r&&(m=true,o=n.apply(a,e)),!m||l||u||(e=a=null),o}}function hr(n){if(!_r(n))throw new Vr(E);return function(){return!n.apply(this,arguments)}}function vr(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),3>>0,e=n.constructor,u=-1,o=e&&n===e.prototype,i=r-1,e=$r(r),a=0t||null==n||!be(t))return r;n=Mr(n);do t%2&&(r+=n),t=oe(t/2),n+=n;while(t);return r}function Ir(n,t){return(n=null==n?"":Mr(n))?null==t?n.slice(h(n),v(n)+1):(t=Mr(t),n.slice(o(n,t),i(n,t)+1)):n}function Rr(n,t,r){var e=typeof n;return"function"==e||null==n?(typeof t=="undefined"||!("prototype"in n))&&n||ht(n,t,r):"object"==e?Tr(n):Fr(n)}function Nr(n){return n}function Tr(n){var t=Pe(n),r=t.length,e=t[0],u=r&&n[e]; -return 1!=r||u!==u||wr(u)?function(e){var u=r;if(u&&!e)return false;for(var o=true;u--&&(o=t[u],o=le.call(e,o)&&At(e[o],n[o],null,true)););return o}:function(n){return n&&le.call(n,e)?(n=n[e],u===n&&(0!==u||1/u==1/n)):false}}function Lr(n,t,r){var e=true,u=t&&mr(t);t&&(r||u.length)||(null==r&&(r=t),t=n,n=c,u=mr(t)),false===r?e=false:wr(r)&&"chain"in r&&(e=r.chain),r=-1;for(var o=_r(n),i=u?u.length:0;++r--n?t.apply(this,arguments):void 0}},c.assign=vr,c.at=function(n,t){var r=arguments,e=-1,u=xt(r,true,false,1),o=u.length,i=typeof t;for("number"!=i&&"string"!=i||!r[2]||r[2][t]!==n||(o=1),Se.unindexedChars&&jr(n)&&(n=n.split("")),r=$r(o);++earguments.length?Ft(t,b|_,null,n):Ft(t,b|_|C,null,n,Vt(arguments,2))},c.chain=function(n){return new q(n,true)},c.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},c.invert=function(n,t){for(var r=-1,e=Pe(n),u=e.length,o={};++ro?0:o>>>0);return bt(n,function(n){var o=u?t:null!=n&&n[t];i[++e]=o?o.apply(n,r):d}),i},c.keys=Pe,c.keysIn=kr,c.map=or,c.mapValues=function(n,t,r){var e={};return t=c.createCallback(t,r,3),Ot(n,function(n,r,u){e[r]=t(n,r,u) -}),e},c.matches=Tr,c.max=ir,c.memoize=function(n,t){if(!_r(n)||t&&!_r(t))throw new Vr(E);var r=function(){var e=r.cache,u=t?t.apply(this,arguments):"_"+arguments[0];return le.call(e,u)?e[u]:e[u]=n.apply(this,arguments)};return r.cache={},r},c.merge=function(n,t,r){var e=arguments,u=e.length,o=typeof r;if(!n||2>u)return n;if("number"!=o&&"string"!=o||!e[3]||e[3][r]!==t||(u=2),3u?0:u>>>0);for(o||(t=c.createCallback(t,r,3)),bt(n,function(n,r,u){if(o)for(r=t.length,u=$r(r);r--;)u[r]=n[t[r]]; -else u=t(n,r,u);i[++e]={a:u,b:e,c:n}}),u=i.length,i.sort(o?l:a);u--;)i[u]=i[u].c;return i},c.tap=function(n,t,r){return t.call(r,n),n},c.throttle=function(n,t,r){var e=true,u=true;if(!_r(n))throw new Vr(E);return false===r?e=false:wr(r)&&(e="leading"in r?!!r.leading:e,u="trailing"in r?!!r.trailing:u),lt.leading=e,lt.maxWait=+t,lt.trailing=u,gr(n,t,lt)},c.times=function(n,t,r){n=0>n?0:n>>>0,t=ht(t,r,1),r=-1;for(var e=$r(n);++rr?0:+r||0,e))-t.length,0<=r&&n.indexOf(t,r)==r},c.escape=function(n){return null==n?"":Mr(n).replace(L,s)},c.escapeRegExp=Ar,c.every=nr,c.find=rr,c.findIndex=Bt,c.findKey=function(n,t,r){return t=c.createCallback(t,r,3),wt(n,t,Ot,true)},c.findLast=function(n,t,r){return t=c.createCallback(t,r,3),wt(n,t,_t) -},c.findLastIndex=function(n,t,r){var e=n?n.length:0;for(t=c.createCallback(t,r,3);e--;)if(t(n[e],e,n))return e;return-1},c.findLastKey=function(n,t,r){return t=c.createCallback(t,r,3),wt(n,t,Et,true)},c.findWhere=function(n,t){return rr(n,Tr(t))},c.has=function(n,t){return n?le.call(n,t):false},c.identity=Nr,c.indexOf=Ut,c.isArguments=dr,c.isArray=Fe,c.isBoolean=function(n){return true===n||false===n||n&&typeof n=="object"&&te.call(n)==Q||false},c.isDate=function(n){return n&&typeof n=="object"&&te.call(n)==nt||false -},c.isElement=br,c.isEmpty=function(n){var t=true;if(!n)return t;var r=n.length;return-1r?xe(e+r,0):Ce(r||0,e-1))+1);e--;)if(n[e]===t)return e;return-1},c.mixin=Lr,c.noConflict=function(){return t._=Qr,this},c.noop=Wr,c.now=qe,c.pad=function(n,t,r){n=null==n?"":Mr(n),t=+t; -var e=n.length;return er?0:+r||0,n.length),n.lastIndexOf(t,r)==r},c.template=function(n,t,r){var e=c.templateSettings;r=yr({},r,e),n=Mr(null==n?"":n);var u,o,i=yr({},r.imports,e.imports),e=Pe(i),i=Er(i),a=0,l=r.interpolate||U,f="__p+='",l=Kr((r.escape||U).source+"|"+l.source+"|"+(l===$?P:U).source+"|"+(r.evaluate||U).source+"|$","g"); -n.replace(l,function(t,r,e,i,l,c){return e||(e=i),f+=n.slice(a,c).replace(M,p),r&&(u=true,f+="'+__e("+r+")+'"),l&&(o=true,f+="';"+l+";\n__p+='"),e&&(f+="'+((__t=("+e+"))==null?'':__t)+'"),a=c+t.length,t}),f+="';",(r=r.variable)||(f="with(obj){"+f+"}"),f=(o?f.replace(I,""):f).replace(R,"$1").replace(N,"$1;"),f="function("+(r||"obj")+"){"+(r?"":"obj||(obj={});")+"var __t,__p=''"+(u?",__e=_.escape":"")+(o?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+f+"return __p}";try{var s=Br(e,"return "+f).apply(d,i) -}catch(g){throw g.source=f,g}return t?s(t):(s.source=f,s)},c.trim=Ir,c.trimLeft=function(n,t){return(n=null==n?"":Mr(n))?null==t?n.slice(h(n)):(t=Mr(t),n.slice(o(n,t))):n},c.trimRight=function(n,t){return(n=null==n?"":Mr(n))?null==t?n.slice(0,v(n)+1):(t=Mr(t),n.slice(0,i(n,t)+1)):n},c.truncate=function(n,t){var r=30,e="...";if(t&&wr(t))var u="separator"in t?t.separator:u,r="length"in t?+t.length||0:r,e="omission"in t?Mr(t.omission):e;else null!=t&&(r=+t||0);if(n=null==n?"":Mr(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(Cr(u)){if(n.slice(o).search(u)){var i,a,l=n.slice(0,o);for(u.global||(u=Kr(u.source,(z.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(T,y))},c.uniqueId=function(n){var t=++A;return Mr(null==n?"":n)+t},c.all=nr,c.any=sr,c.detect=rr,c.foldl=lr,c.foldr=fr,c.include=Qt,c.inject=lr,Lr(function(){var n={}; -return Ot(c,function(t,r){c.prototype[r]||(n[r]=t)}),n}(),false),c.first=qt,c.last=Kt,c.sample=function(n,t,r){return n&&typeof n.length!="number"?n=Er(n):Se.unindexedChars&&jr(n)&&(n=n.split("")),null==t||r?(t=n?n.length:0,0t?0:+t||0,n.length),n)},c.take=qt,c.takeRight=Kt,c.takeRightWhile=Kt,c.takeWhile=qt,c.head=qt,Ot(c,function(n,t){var r="sample"!==t;c.prototype[t]||(c.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 q(o,u):o -})}),c.VERSION=k,c.prototype.chain=function(){return this.__chain__=true,this},c.prototype.toJSON=Ht,c.prototype.toString=function(){return Mr(this.__wrapped__)},c.prototype.value=Ht,c.prototype.valueOf=Ht,V(["join","pop","shift"],function(n){var t=Jr[n];c.prototype[n]=function(){var n=this.__chain__,r=t.apply(this.__wrapped__,arguments);return n?new q(r,n):r}}),V(["push","reverse","sort","unshift"],function(n){var t=Jr[n];c.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),V(["concat","splice"],function(n){var t=Jr[n]; -c.prototype[n]=function(){return new q(t.apply(this.__wrapped__,arguments),this.__chain__)}}),Se.spliceObjects||V(["pop","shift","splice"],function(n){var t=Jr[n],r="splice"==n;c.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 q(u,n):u}}),c}var d,b=1,_=2,w=4,x=8,C=16,j=32,k="2.4.1",O="__lodash@"+k+"__",E="Expected a function",A=0,S=/^[A-Z]+$/,I=/\b__p\+='';/g,R=/\b(__p\+=)''\+/g,N=/(__e\(.*?\)|\b__t\))\+'';/g,T=/&(?:amp|lt|gt|quot|#39);/g,L=/[&<>"']/g,W=/<%-([\s\S]+?)%>/g,F=/<%([\s\S]+?)%>/g,$=/<%=([\s\S]+?)%>/g,P=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,z=/\w*$/,D=/^\s*function[ \n\r\t]+\w/,B=/^0[xX]/,q=/[\xC0-\xFF]/g,U=/($^)/,Z=/[.*+?^${}()|[\]\/\\]/g,K=/\bthis\b/,M=/['\n\r\u2028\u2029\\]/g,V=/[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[a-z]+|[0-9]+/g,J=" \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",X="Array Boolean Date Error Function Math Number Object RegExp Set String _ clearTimeout document isFinite isNaN parseInt setTimeout TypeError window WinRTError".split(" "),Y="constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" "),G="[object Arguments]",H="[object Array]",Q="[object Boolean]",nt="[object Date]",tt="[object Error]",rt="[object Function]",et="[object Number]",ut="[object Object]",ot="[object RegExp]",it="[object String]",at={}; +}return t}function v(n){for(var t=n.length;t--;){var r=n.charCodeAt(t);if((160r||13r||8202>>0:0,u=Pr(e);++ri(t,l)&&f.push(l);return f}function bt(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 Nt(n,t){for(var r=-1,e=t(n),u=e.length,o=Pr(u);++ro?0:o)}function Zt(n,t,e){var u=n?n.length:0;if(typeof e=="number")e=0>e?Ce(u+e,0):e||0;else if(e)return e=Xt(n,t),u&&n[e]===t?e:-1;return r(n,t,e)}function Kt(n,t,r){var e=n?n.length:0;if(typeof t!="number"&&null!=t){var u=e,o=0;for(t=c.createCallback(t,r,3);u--&&t(n[u],u,n);)o++}else o=null==t||r?1:t;return o=e-(o||0),Jt(n,0,0>o?0:o)}function Mt(n,t,r){var e=n?n.length:0;if(typeof t!="number"&&null!=t){var u=e,o=0; +for(t=c.createCallback(t,r,3);u--&&t(n[u],u,n);)o++}else if(o=t,null==o||r)return n?n[e-1]:d;return o=e-(o||0),Jt(n,0>o?0:o)}function Vt(n,t,r){if(typeof t!="number"&&null!=t){var e=-1,u=n?n.length:0,o=0;for(t=c.createCallback(t,r,3);++et?0:t;return Jt(n,o)}function Jt(n,t,r){var e=-1,u=n?n.length:0;for(t=typeof t=="undefined"?0:+t||0,0>t?t=Ce(u+t,0):t>u&&(t=u),r=typeof r=="undefined"?u:+r||0,0>r?r=Ce(u+r,0):r>u&&(r=u),u=t>r?0:r-t,r=Pr(u);++e>>1,r(n[e])r?0:r);++tr?Ce(e+r,0):r||0:0,typeof n=="string"||!$e(n)&&kr(n)?ro&&(o=a)}else t=null==t&&kr(n)?u:c.createCallback(t,r,3),bt(n,function(n,r,u){r=t(n,r,u),(r>e||-1/0===r&&r===o)&&(e=r,o=n)});return o}function lr(n,t){return ir(n,$r(t))}function fr(n,t,r,e){var u=3>arguments.length; +if(t=c.createCallback(t,e,4),$e(n)){var o=-1,i=n.length;for(u&&i&&(r=n[++o]);++oarguments.length;return t=c.createCallback(t,e,4),_t(n,function(n,e,o){r=u?(u=false,n):t(r,n,e,o)}),r}function sr(n){var t=-1,r=n&&n.length,e=Pr(0>r?0:r>>>0);return bt(n,function(n){var r=It(0,++t);e[t]=e[r],e[r]=n}),e}function pr(n,t,r){var e;if(t=c.createCallback(t,r,3),$e(n)){r=-1;for(var u=n.length;++rarguments.length)return Ft(n,b,null,t);if(n)var r=n[O]?n[O][2]:n.length,e=Jt(arguments,2),r=r-e.length;return Ft(n,b|C,r,t,e)}function hr(n,t,r){var e,u,o,i,a,l,f,c=0,s=false,p=true;if(!wr(n))throw new Jr(E);if(t=0>t?0:t,true===r)var g=true,p=false;else xr(r)&&(g=r.leading,s="maxWait"in r&&Ce(t,+r.maxWait||0),p="trailing"in r?r.trailing:p);var h=function(){var r=t-(Ue()-i);0>=r||r>t?(u&&oe(u),r=f,u=l=f=d,r&&(c=Ue(),o=n.apply(a,e),l||u||(e=a=null))):l=ge(h,r) +},v=function(){l&&oe(l),u=l=f=d,(p||s!==t)&&(c=Ue(),o=n.apply(a,e),l||u||(e=a=null))};return function(){if(e=arguments,i=Ue(),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=oe(u)),c=i,o=n.apply(a,e)):u||(u=ge(v,y))}return m&&l?l=oe(l):l||t===s||(l=ge(h,t)),r&&(m=true,o=n.apply(a,e)),!m||l||u||(e=a=null),o}}function vr(n){if(!wr(n))throw new Jr(E);return function(){return!n.apply(this,arguments)}}function yr(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),3>>0,e=n.constructor,u=-1,o=e&&n===e.prototype,i=r-1,e=Pr(r),a=0t||null==n||!_e(t))return r;n=Vr(n);do t%2&&(r+=n),t=ie(t/2),n+=n;while(t);return r}function Rr(n,t){return(n=null==n?"":Vr(n))?null==t?n.slice(h(n),v(n)+1):(t=Vr(t),n.slice(o(n,t),i(n,t)+1)):n}function Nr(n,t,r){var e=typeof n;return"function"==e||null==n?(typeof t=="undefined"||!("prototype"in n))&&n||ht(n,t,r):"object"==e?Lr(n):$r(n)}function Tr(n){return n}function Lr(n){var t=ze(n),r=t.length,e=t[0],u=r&&n[e]; +return 1!=r||u!==u||xr(u)?function(e){var u=r;if(u&&!e)return false;for(var o=true;u--&&(o=t[u],o=fe.call(e,o)&&At(e[o],n[o],null,true)););return o}:function(n){return n&&fe.call(n,e)?(n=n[e],u===n&&(0!==u||1/u==1/n)):false}}function Wr(n,t,r){var e=true,u=t&&dr(t);t&&(r||u.length)||(null==r&&(r=t),t=n,n=this,u=dr(t)),false===r?e=false:xr(r)&&"chain"in r&&(e=r.chain),r=-1;for(var o=wr(n),i=u?u.length:0;++r--n?t.apply(this,arguments):void 0}},c.assign=yr,c.at=function(n,t){var r=arguments,e=-1,u=xt(r,true,false,1),o=u.length,i=typeof t;for("number"!=i&&"string"!=i||!r[2]||r[2][t]!==n||(o=1),Ie.unindexedChars&&kr(n)&&(n=n.split("")),r=Pr(o);++earguments.length?Ft(t,b|_,null,n):Ft(t,b|_|C,null,n,Jt(arguments,2))},c.chain=function(n){return new q(n,true)},c.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},c.invert=function(n,t){for(var r=-1,e=ze(n),u=e.length,o={};++ro?0:o>>>0);return bt(n,function(n){var o=u?t:null!=n&&n[t];i[++e]=o?o.apply(n,r):d}),i},c.keys=ze,c.keysIn=Or,c.map=ir,c.mapValues=function(n,t,r){var e={};return t=c.createCallback(t,r,3),Ot(n,function(n,r,u){e[r]=t(n,r,u) +}),e},c.matches=Lr,c.max=ar,c.memoize=function(n,t){if(!wr(n)||t&&!wr(t))throw new Jr(E);var r=function(){var e=r.cache,u=t?t.apply(this,arguments):"_"+arguments[0];return fe.call(e,u)?e[u]:e[u]=n.apply(this,arguments)};return r.cache={},r},c.merge=function(n,t,r){var e=arguments,u=e.length,o=typeof r;if(!n||2>u)return n;if("number"!=o&&"string"!=o||!e[3]||e[3][r]!==t||(u=2),3u?0:u>>>0);for(o||(t=c.createCallback(t,r,3)),bt(n,function(n,r,u){if(o)for(r=t.length,u=Pr(r);r--;)u[r]=n[t[r]]; +else u=t(n,r,u);i[++e]={a:u,b:e,c:n}}),u=i.length,i.sort(o?l:a);u--;)i[u]=i[u].c;return i},c.tap=function(n,t,r){return t.call(r,n),n},c.throttle=function(n,t,r){var e=true,u=true;if(!wr(n))throw new Jr(E);return false===r?e=false:xr(r)&&(e="leading"in r?!!r.leading:e,u="trailing"in r?!!r.trailing:u),lt.leading=e,lt.maxWait=+t,lt.trailing=u,hr(n,t,lt)},c.times=function(n,t,r){n=0>n?0:n>>>0,t=ht(t,r,1),r=-1;for(var e=Pr(n);++rr?0:+r||0,e))-t.length,0<=r&&n.indexOf(t,r)==r},c.escape=function(n){return null==n?"":Vr(n).replace(L,s)},c.escapeRegExp=Sr,c.every=tr,c.find=er,c.findIndex=qt,c.findKey=function(n,t,r){return t=c.createCallback(t,r,3),wt(n,t,Ot,true)},c.findLast=function(n,t,r){return t=c.createCallback(t,r,3),wt(n,t,_t) +},c.findLastIndex=function(n,t,r){var e=n?n.length:0;for(t=c.createCallback(t,r,3);e--;)if(t(n[e],e,n))return e;return-1},c.findLastKey=function(n,t,r){return t=c.createCallback(t,r,3),wt(n,t,Et,true)},c.findWhere=function(n,t){return er(n,Lr(t))},c.has=function(n,t){return n?fe.call(n,t):false},c.identity=Tr,c.indexOf=Zt,c.isArguments=br,c.isArray=$e,c.isBoolean=function(n){return true===n||false===n||n&&typeof n=="object"&&re.call(n)==Q||false},c.isDate=function(n){return n&&typeof n=="object"&&re.call(n)==nt||false +},c.isElement=_r,c.isEmpty=function(n){var t=true;if(!n)return t;var r=n.length;return-1r?Ce(e+r,0):je(r||0,e-1))+1);e--;)if(n[e]===t)return e;return-1},c.noConflict=function(){return t._=ne,this},c.noop=Fr,c.now=Ue,c.pad=function(n,t,r){n=null==n?"":Vr(n),t=+t;var e=n.length; +return er?0:+r||0,n.length),n.lastIndexOf(t,r)==r},c.template=function(n,t,r){var e=c.templateSettings;r=mr({},r,e),n=Vr(null==n?"":n);var u,o,i=mr({},r.imports,e.imports),e=ze(i),i=Ar(i),a=0,l=r.interpolate||U,f="__p+='",l=Mr((r.escape||U).source+"|"+l.source+"|"+(l===$?P:U).source+"|"+(r.evaluate||U).source+"|$","g"); +n.replace(l,function(t,r,e,i,l,c){return e||(e=i),f+=n.slice(a,c).replace(M,p),r&&(u=true,f+="'+__e("+r+")+'"),l&&(o=true,f+="';"+l+";\n__p+='"),e&&(f+="'+((__t=("+e+"))==null?'':__t)+'"),a=c+t.length,t}),f+="';",(r=r.variable)||(f="with(obj){"+f+"}"),f=(o?f.replace(I,""):f).replace(R,"$1").replace(N,"$1;"),f="function("+(r||"obj")+"){"+(r?"":"obj||(obj={});")+"var __t,__p=''"+(u?",__e=_.escape":"")+(o?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+f+"return __p}";try{var s=qr(e,"return "+f).apply(d,i) +}catch(g){throw g.source=f,g}return t?s(t):(s.source=f,s)},c.trim=Rr,c.trimLeft=function(n,t){return(n=null==n?"":Vr(n))?null==t?n.slice(h(n)):(t=Vr(t),n.slice(o(n,t))):n},c.trimRight=function(n,t){return(n=null==n?"":Vr(n))?null==t?n.slice(0,v(n)+1):(t=Vr(t),n.slice(0,i(n,t)+1)):n},c.truncate=function(n,t){var r=30,e="...";if(t&&xr(t))var u="separator"in t?t.separator:u,r="length"in t?+t.length||0:r,e="omission"in t?Vr(t.omission):e;else null!=t&&(r=+t||0);if(n=null==n?"":Vr(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(jr(u)){if(n.slice(o).search(u)){var i,a,l=n.slice(0,o);for(u.global||(u=Mr(u.source,(z.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(T,y))},c.uniqueId=function(n){var t=++A;return Vr(null==n?"":n)+t},c.all=tr,c.any=pr,c.detect=er,c.foldl=fr,c.foldr=cr,c.include=nr,c.inject=fr,Wr(c,function(){var n={}; +return Ot(c,function(t,r){c.prototype[r]||(n[r]=t)}),n}(),false),c.first=Ut,c.last=Mt,c.sample=function(n,t,r){return n&&typeof n.length!="number"?n=Ar(n):Ie.unindexedChars&&kr(n)&&(n=n.split("")),null==t||r?(t=n?n.length:0,0t?0:+t||0,n.length),n)},c.take=Ut,c.takeRight=Mt,c.takeRightWhile=Mt,c.takeWhile=Ut,c.head=Ut,Ot(c,function(n,t){var r="sample"!==t;c.prototype[t]||(c.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 q(o,u):o +})}),c.VERSION=k,c.prototype.chain=function(){return this.__chain__=true,this},c.prototype.toJSON=Qt,c.prototype.toString=function(){return Vr(this.__wrapped__)},c.prototype.value=Qt,c.prototype.valueOf=Qt,V(["join","pop","shift"],function(n){var t=Xr[n];c.prototype[n]=function(){var n=this.__chain__,r=t.apply(this.__wrapped__,arguments);return n?new q(r,n):r}}),V(["push","reverse","sort","unshift"],function(n){var t=Xr[n];c.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),V(["concat","splice"],function(n){var t=Xr[n]; +c.prototype[n]=function(){return new q(t.apply(this.__wrapped__,arguments),this.__chain__)}}),Ie.spliceObjects||V(["pop","shift","splice"],function(n){var t=Xr[n],r="splice"==n;c.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 q(u,n):u}}),c}var d,b=1,_=2,w=4,x=8,C=16,j=32,k="2.4.1",O="__lodash@"+k+"__",E="Expected a function",A=0,S=/^[A-Z]+$/,I=/\b__p\+='';/g,R=/\b(__p\+=)''\+/g,N=/(__e\(.*?\)|\b__t\))\+'';/g,T=/&(?:amp|lt|gt|quot|#39);/g,L=/[&<>"']/g,W=/<%-([\s\S]+?)%>/g,F=/<%([\s\S]+?)%>/g,$=/<%=([\s\S]+?)%>/g,P=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,z=/\w*$/,D=/^\s*function[ \n\r\t]+\w/,B=/^0[xX]/,q=/[\xC0-\xFF]/g,U=/($^)/,Z=/[.*+?^${}()|[\]\/\\]/g,K=/\bthis\b/,M=/['\n\r\u2028\u2029\\]/g,V=/[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[a-z]+|[0-9]+/g,J=" \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",X="Array Boolean Date Error Function Math Number Object RegExp Set String _ clearTimeout document isFinite isNaN parseInt setTimeout TypeError window WinRTError".split(" "),Y="constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" "),G="[object Arguments]",H="[object Array]",Q="[object Boolean]",nt="[object Date]",tt="[object Error]",rt="[object Function]",et="[object Number]",ut="[object Object]",ot="[object RegExp]",it="[object String]",at={}; at[rt]=false,at[G]=at[H]=at[Q]=at[nt]=at[et]=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={"&":"&","<":"<",">":">",'"':""","'":"'"},st={"&":"&","<":"<",">":">",""":'"',"'":"'"},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":" "},gt={"function":true,object:true},ht={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},vt=gt[typeof window]&&window||this,yt=gt[typeof exports]&&exports&&!exports.nodeType&&exports,gt=gt[typeof module]&&module&&!module.nodeType&&module,mt=yt&>&&typeof global=="object"&&global; !mt||mt.global!==mt&&mt.window!==mt&&mt.self!==mt||(vt=mt);var mt=gt&>.exports===yt&&yt,dt=m();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(vt._=dt, define(function(){return dt})):yt&>?mt?(gt.exports=dt)._=dt:yt._=dt:vt._=dt}).call(this); \ No newline at end of file diff --git a/dist/lodash.js b/dist/lodash.js index 4eed30349..576818358 100644 --- a/dist/lodash.js +++ b/dist/lodash.js @@ -629,12 +629,12 @@ * `flatten`, `forEach`, `forEachRight`, `forIn`, `forInRight`, `forOwn`, * `forOwnRight`, `functions`, `groupBy`, `indexBy`, `initial`, `intersection`, * `invert`, `invoke`, `keys`, `map`, `mapValues`, `matches`, `max`, `memoize`, - * `merge`, `min`, `noop`, `object`, `omit`, `once`, `pairs`, `partial`, - * `partialRight`, `pick`, `pluck`, `property`, `pull`, `push`, `range`, - * `reject`, `remove`, `rest`, `reverse`, `shuffle`, `slice`, `sort`, `sortBy`, - * `splice`, `tap`, `throttle`, `times`, `toArray`, `transform`, `union`, - * `uniq`, `unshift`, `unzip`, `values`, `where`, `without`, `wrap`, `xor`, - * and `zip` + * `merge`, `min`, `mixin`, `noop`, `object`, `omit`, `once`, `pairs`, + * `partial`, `partialRight`, `pick`, `pluck`, `property`, `pull`, `push`, + * `range`, `reject`, `remove`, `rest`, `reverse`, `shuffle`, `slice`, `sort`, + * `sortBy`, `splice`, `tap`, `throttle`, `times`, `toArray`, `transform`, + * `union`, `uniq`, `unshift`, `unzip`, `values`, `where`, `without`, `wrap`, + * `xor`, and `zip` * * The non-chainable wrapper functions are: * `capitalize`, `clone`, `cloneDeep`, `contains`, `escape`, `every`, `find`, @@ -642,10 +642,10 @@ * `identity`, `indexOf`, `isArguments`, `isArray`, `isBoolean`, `isDate`, * `isElement`, `isEmpty`, `isEqual`, `isFinite`, `isFunction`, `isNaN`, * `isNull`, `isNumber`, `isObject`, `isPlainObject`, `isRegExp`, `isString`, - * `isUndefined`, `join`, `lastIndexOf`, `mixin`, `noConflict`, `now`, - * `parseInt`, `pop`, `random`, `reduce`, `reduceRight`, `result`, `shift`, - * `size`, `some`, `sortedIndex`, `runInContext`, `template`, `trim`, - * `trimLeft`, `trimRight`, `unescape`, `uniqueId`, and `value` + * `isUndefined`, `join`, `lastIndexOf`, `noConflict`, `now`, `parseInt`, + * `pop`, `random`, `reduce`, `reduceRight`, `result`, `shift`, `size`, `some`, + * `sortedIndex`, `runInContext`, `template`, `trim`, `trimLeft`, `trimRight`, + * `unescape`, `uniqueId`, and `value` * * The wrapper functions `first`, `last`, and `sample` return wrapped values * when `n` is provided, otherwise they return unwrapped values. @@ -1137,7 +1137,7 @@ args = composeArgsRight(partialRightArgs, partialRightHolders, args); } if (isCurry) { - var newPartialHolders = []; + var newPartialHolders = getHolders(args); length -= newPartialHolders.length; if (length < arity) { @@ -1553,6 +1553,9 @@ break; } } + if (!result) { + break; + } } else if (!(result = baseIsEqual(value[size], othValue, callback, isWhere, stackA, stackB))) { break; } @@ -1971,10 +1974,10 @@ return createWrapper.apply(null, data); } if (isPartial) { - var partialHolders = []; + var partialHolders = getHolders(partialArgs); } if (isPartialRight) { - var partialRightHolders = []; + var partialRightHolders = getHolders(partialRightArgs); } if (arity == null) { arity = isBindKey ? 0 : func.length; @@ -1988,6 +1991,26 @@ : baseCreateWrapper(data); } + /** + * Finds the indexes of all placeholder elements in `array`. + * + * @private + * @param {Array} array The array to inspect. + * @returns {Array} Returns the new array of placeholder indexes. + */ + function getHolders(array) { + var index = -1, + length = array.length, + result = []; + + while (++index < length) { + if (array[index] === lodash) { + result.push(index); + } + } + return result; + } + /** * Gets the appropriate "indexOf" function. If the `_.indexOf` method is * customized this function returns the custom method, otherwise it returns @@ -2883,17 +2906,17 @@ * // => 2 * * var dict = { - * 'wordToNumber': { 'twenty': 20, 'thirty': 30, 'fourty': 40, 'fifty': 50 } + * 'wordToNumber': { 'twenty': 20, 'thirty': 30, 'forty': 40, 'fifty': 50 } * }; * * // using `callback` - * _.sortedIndex(['twenty', 'thirty', 'fifty'], 'fourty', function(word) { + * _.sortedIndex(['twenty', 'thirty', 'fifty'], 'forty', function(word) { * return dict.wordToNumber[word]; * }); * // => 2 * * // using `callback` with `thisArg` - * _.sortedIndex(['twenty', 'thirty', 'fifty'], 'fourty', function(word) { + * _.sortedIndex(['twenty', 'thirty', 'fifty'], 'forty', function(word) { * return this.wordToNumber[word]; * }, dict); * // => 2 @@ -7644,11 +7667,12 @@ * @static * @memberOf _ * @category Utilities - * @param {Function|Object} [object=lodash] object The destination object. + * @param {Function|Object} [object=this] object The destination object. * @param {Object} source The object of functions to add. * @param {Object} [options] The options object. * @param {boolean} [options.chain=true] Specify whether the functions added * are chainable. + * @returns {Function|Object} Returns `object`. * @example * * function vowels(string) { @@ -7677,7 +7701,7 @@ options = source; } source = object; - object = lodash; + object = this; methodNames = functions(source); } if (options === false) { @@ -7714,6 +7738,7 @@ }(func)); } } + return object; } /** @@ -8086,6 +8111,7 @@ lodash.memoize = memoize; lodash.merge = merge; lodash.min = min; + lodash.mixin = mixin; lodash.negate = negate; lodash.omit = omit; lodash.once = once; @@ -8134,7 +8160,7 @@ lodash.unzip = zip; // add functions to `lodash.prototype` - mixin(assign({}, lodash)); + mixin(lodash, assign({}, lodash)); /*--------------------------------------------------------------------------*/ @@ -8178,7 +8204,6 @@ lodash.isUndefined = isUndefined; lodash.kebabCase = kebabCase; lodash.lastIndexOf = lastIndexOf; - lodash.mixin = mixin; lodash.noConflict = noConflict; lodash.noop = noop; lodash.now = now; @@ -8214,7 +8239,7 @@ lodash.include = contains; lodash.inject = reduce; - mixin(function() { + mixin(lodash, function() { var source = {} baseForOwn(lodash, function(func, methodName) { if (!lodash.prototype[methodName]) { diff --git a/dist/lodash.min.js b/dist/lodash.min.js index 96dd4a512..daf0fb0a9 100644 --- a/dist/lodash.min.js +++ b/dist/lodash.min.js @@ -5,62 +5,62 @@ */ ;(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=Fe(r);++ei(t,f)&&l.push(f);return l}function mt(n,t){var e=-1,r=n?n.length:0;if(typeof r=="number"&&-1a(p,h)&&((u||l)&&p.push(h),c.push(s))}return c}function Rt(n,t){for(var e=-1,r=t(n),u=r.length,o=Fe(u);++eo?0:o)}function qt(n,t,r){var u=n?n.length:0;if(typeof r=="number")r=0>r?dr(u+r,0):r||0;else if(r)return r=Mt(n,t),u&&n[r]===t?r:-1;return e(n,t,r)}function Ut(n,t,e){var r=n?n.length:0;if(typeof t!="number"&&null!=t){var u=r,o=0;for(t=c.createCallback(t,e,3);u--&&t(n[u],u,n);)o++}else o=null==t||e?1:t;return o=r-(o||0),Kt(n,0,0>o?0:o)}function Zt(n,t,e){var r=n?n.length:0;if(typeof t!="number"&&null!=t){var u=r,o=0; -for(t=c.createCallback(t,e,3);u--&&t(n[u],u,n);)o++}else if(o=t,null==o||e)return n?n[r-1]:m;return o=r-(o||0),Kt(n,0>o?0:o)}function Pt(n,t,e){if(typeof t!="number"&&null!=t){var r=-1,u=n?n.length:0,o=0;for(t=c.createCallback(t,e,3);++rt?0:t;return Kt(n,o)}function Kt(n,t,e){var r=-1,u=n?n.length:0;for(t=typeof t=="undefined"?0:+t||0,0>t?t=dr(u+t,0):t>u&&(t=u),e=typeof e=="undefined"?u:+e||0,0>e?e=dr(u+e,0):e>u&&(e=u),u=t>e?0:e-t,e=Fe(u);++r>>1,e(n[r])e?0:e);++te?dr(r+e,0):e||0:0,typeof n=="string"||!Nr(n)&&je(n)?eo&&(o=a)}else t=null==t&&je(n)?u:c.createCallback(t,e,3),mt(n,function(n,e,u){e=t(n,e,u),(e>r||-1/0===e&&e===o)&&(r=e,o=n)});return o}function oe(n,t){return re(n,We(t))}function ie(n,t,e,r){var u=3>arguments.length;t=c.createCallback(t,r,4);var o=-1,i=n?n.length:0;if(typeof i=="number"&&-1arguments.length;return t=c.createCallback(t,r,4),dt(n,function(n,r,o){e=u?(u=false,n):t(e,n,r,o) -}),e}function fe(n){var t=-1,e=n&&n.length,r=Fe(0>e?0:e>>>0);return mt(n,function(n){var e=Et(0,++t);r[t]=r[e],r[e]=n}),r}function le(n,t,e){var r;t=c.createCallback(t,e,3),e=-1;var u=n?n.length:0;if(typeof u=="number"&&-1arguments.length)return Wt(n,d,null,t);if(n)var e=n[C]?n[C][2]:n.length,r=Kt(arguments,2),e=e-r.length;return Wt(n,d|j,e,t,r)}function pe(n,t,e){function r(){c&&nr(c),i=c=p=m,(g||h!==t)&&(s=zr(),a=n.apply(l,o),c||i||(o=l=null)) -}function u(){var e=t-(zr()-f);0>=e||e>t?(i&&nr(i),e=p,i=c=p=m,e&&(s=zr(),a=n.apply(l,o),c||i||(o=l=null))):c=fr(u,e)}var o,i,a,f,l,c,p,s=0,h=false,g=true;if(!de(n))throw new Pe(O);if(t=0>t?0:t,true===e)var v=true,g=false;else be(e)&&(v=e.leading,h="maxWait"in e&&dr(t,+e.maxWait||0),g="trailing"in e?e.trailing:g);return function(){if(o=arguments,f=zr(),l=this,p=g&&(c||!v),false===h)var e=v&&!c;else{i||v||(s=f);var y=h-(f-s),m=0>=y||y>h;m?(i&&(i=nr(i)),s=f,a=n.apply(l,o)):i||(i=fr(r,y))}return m&&c?c=nr(c):c||t===h||(c=fr(u,t)),e&&(m=true,a=n.apply(l,o)),!m||c||i||(o=l=null),a -}}function se(n){if(!de(n))throw new Pe(O);return function(){return!n.apply(this,arguments)}}function he(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),3>>0,r=n.constructor,u=-1,r=r&&n===r.prototype,o=e-1,i=Fe(e),a=0t||null==n||!vr(t))return e;n=Ze(n);do t%2&&(e+=n),t=tr(t/2),n+=n;while(t);return e}function Ee(n,t){return(n=null==n?"":Ze(n))?null==t?n.slice(h(n),g(n)+1):(t=Ze(t),n.slice(o(n,t),i(n,t)+1)):n}function Ie(n,t,e){var r=typeof n;return"function"==r||null==n?(typeof t=="undefined"||!("prototype"in n))&&n||st(n,t,e):"object"==r?Ne(n):We(n) -}function Re(n){return n}function Ne(n){var t=Tr(n),e=t.length,r=t[0],u=e&&n[r];return 1!=e||u!==u||be(u)?function(r){var u=e;if(u&&!r)return false;for(var o=true;u--&&(o=t[u],o=ur.call(r,o)&&Ot(r[o],n[o],null,true)););return o}:function(n){return n&&ur.call(n,r)?(n=n[r],u===n&&(0!==u||1/u==1/n)):false}}function Se(n,t,e){var r=true,u=t&&ve(t);t&&(e||u.length)||(null==e&&(e=t),t=n,n=c,u=ve(t)),false===e?r=false:be(e)&&"chain"in e&&(r=e.chain),e=-1;for(var o=de(n),i=u?u.length:0;++e--n?t.apply(this,arguments):void 0 -}},c.assign=he,c.at=function(n,t){var e=arguments,r=-1,u=_t(e,true,false,1),o=u.length,i=typeof t;for("number"!=i&&"string"!=i||!e[2]||e[2][t]!==n||(o=1),e=Fe(o);++rarguments.length?Wt(t,d|b,null,n):Wt(t,d|b|j,null,n,Kt(arguments,2))},c.chain=function(n){return new q(n,true)},c.compact=function(n){for(var t=-1,e=n?n.length:0,r=0,u=[];++t(s?r(s,f):i(p,f))){for(t=u;--t;){var h=o[t];if(0>(h?r(h,f):i(n[t],f)))continue n}s&&s.push(f),p.push(f)}return p},c.invert=function(n,t){for(var e=-1,r=Tr(n),u=r.length,o={};++eo?0:o>>>0);return mt(n,function(n){var o=u?t:null!=n&&n[t];i[++r]=o?o.apply(n,e):m -}),i},c.keys=Tr,c.keysIn=xe,c.map=re,c.mapValues=function(n,t,e){var r={};return t=c.createCallback(t,e,3),kt(n,function(n,e,u){r[e]=t(n,e,u)}),r},c.matches=Ne,c.max=ue,c.memoize=function(n,t){function e(){var r=e.cache,u=t?t.apply(this,arguments):"_"+arguments[0];return ur.call(r,u)?r[u]:r[u]=n.apply(this,arguments)}if(!de(n)||t&&!de(t))throw new Pe(O);return e.cache={},e},c.merge=function(n,t,e){var r=arguments,u=r.length,o=typeof e;if(!n||2>u)return n;if("number"!=o&&"string"!=o||!r[3]||r[3][e]!==t||(u=2),3u?0:u>>>0);for(o||(t=c.createCallback(t,e,3)),mt(n,function(n,e,u){if(o)for(e=t.length,u=Fe(e);e--;)u[e]=n[t[e]];else u=t(n,e,u);i[++r]={a:u,b:r,c:n}}),u=i.length,i.sort(o?f:a);u--;)i[u]=i[u].c;return i},c.tap=function(n,t,e){return t.call(e,n),n},c.throttle=function(n,t,e){var r=true,u=true;if(!de(n))throw new Pe(O); -return false===e?r=false:be(e)&&(r="leading"in e?!!e.leading:r,u="trailing"in e?!!e.trailing:u),it.leading=r,it.maxWait=+t,it.trailing=u,pe(n,t,it)},c.times=function(n,t,e){n=0>n?0:n>>>0,t=st(t,e,1),e=-1;for(var r=Fe(n);++ee?0:+e||0,r))-t.length,0<=e&&n.indexOf(t,e)==e},c.escape=function(n){return null==n?"":Ze(n).replace(T,p)},c.escapeRegExp=Oe,c.every=Ht,c.find=ne,c.findIndex=Lt,c.findKey=function(n,t,e){return t=c.createCallback(t,e,3),bt(n,t,kt,true) -},c.findLast=function(n,t,e){return t=c.createCallback(t,e,3),bt(n,t,dt)},c.findLastIndex=function(n,t,e){var r=n?n.length:0;for(t=c.createCallback(t,e,3);r--;)if(t(n[r],r,n))return r;return-1},c.findLastKey=function(n,t,e){return t=c.createCallback(t,e,3),bt(n,t,Ct,true)},c.findWhere=function(n,t){return ne(n,Ne(t))},c.has=function(n,t){return n?ur.call(n,t):false},c.identity=Re,c.indexOf=qt,c.isArguments=ye,c.isArray=Nr,c.isBoolean=function(n){return true===n||false===n||n&&typeof n=="object"&&Ge.call(n)==G||false -},c.isDate=function(n){return n&&typeof n=="object"&&Ge.call(n)==H||false},c.isElement=me,c.isEmpty=function(n){var t=true;if(!n)return t;var e=n.length;return-1e?dr(r+e,0):br(e||0,r-1))+1);r--;)if(n[r]===t)return r;return-1},c.mixin=Se,c.noConflict=function(){return t._=Xe,this},c.noop=Te,c.now=zr,c.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},c.template=function(n,t,e){var r=c.templateSettings;e=ge({},e,r),n=Ze(null==n?"":n);var u,o,i=ge({},e.imports,r.imports),r=Tr(i),i=Ce(i),a=0,f=e.interpolate||U,l="__p+='",f=Ue((e.escape||U).source+"|"+f.source+"|"+(f===$?z:U).source+"|"+(e.evaluate||U).source+"|$","g"); -n.replace(f,function(t,e,r,i,f,c){return r||(r=i),l+=n.slice(a,c).replace(K,s),e&&(u=true,l+="'+__e("+e+")+'"),f&&(o=true,l+="';"+f+";\n__p+='"),r&&(l+="'+((__t=("+r+"))==null?'':__t)+'"),a=c+t.length,t}),l+="';",(e=e.variable)||(l="with(obj){"+l+"}"),l=(o?l.replace(I,""):l).replace(R,"$1").replace(N,"$1;"),l="function("+(e||"obj")+"){"+(e?"":"obj||(obj={});")+"var __t,__p=''"+(u?",__e=_.escape":"")+(o?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+l+"return __p}";try{var p=De(r,"return "+l).apply(m,i) -}catch(h){throw h.source=l,h}return t?p(t):(p.source=l,p)},c.trim=Ee,c.trimLeft=function(n,t){return(n=null==n?"":Ze(n))?null==t?n.slice(h(n)):(t=Ze(t),n.slice(o(n,t))):n},c.trimRight=function(n,t){return(n=null==n?"":Ze(n))?null==t?n.slice(0,g(n)+1):(t=Ze(t),n.slice(0,i(n,t)+1)):n},c.truncate=function(n,t){var e=30,r="...";if(t&&be(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(we(u)){if(n.slice(o).search(u)){var i,a,f=n.slice(0,o);for(u.global||(u=Ue(u.source,(D.exec(u)||"")+"g")),u.lastIndex=0;i=u.exec(f);)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(S,v))},c.uniqueId=function(n){var t=++A;return Ze(null==n?"":n)+t},c.all=Ht,c.any=le,c.detect=ne,c.foldl=ie,c.foldr=ae,c.include=Gt,c.inject=ie,Se(function(){var n={}; -return kt(c,function(t,e){c.prototype[e]||(n[e]=t)}),n}(),false),c.first=Bt,c.last=Zt,c.sample=function(n,t,e){return n&&typeof n.length!="number"&&(n=Ce(n)),null==t||e?(t=n?n.length:0,0t?0:+t||0,n.length),n)},c.take=Bt,c.takeRight=Zt,c.takeRightWhile=Zt,c.takeWhile=Bt,c.head=Bt,kt(c,function(n,t){var e="sample"!==t;c.prototype[t]||(c.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 q(o,u):o -})}),c.VERSION=k,c.prototype.chain=function(){return this.__chain__=true,this},c.prototype.toJSON=Yt,c.prototype.toString=function(){return Ze(this.__wrapped__)},c.prototype.value=Yt,c.prototype.valueOf=Yt,M(["join","pop","shift"],function(n){var t=Ke[n];c.prototype[n]=function(){var n=this.__chain__,e=t.apply(this.__wrapped__,arguments);return n?new q(e,n):e}}),M(["push","reverse","sort","unshift"],function(n){var t=Ke[n];c.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),M(["concat","splice"],function(n){var t=Ke[n]; -c.prototype[n]=function(){return new q(t.apply(this.__wrapped__,arguments),this.__chain__)}}),c}var m,d=1,b=2,_=4,w=8,j=16,x=32,k="2.4.1",C="__lodash@"+k+"__",O="Expected a function",A=0,E=/^[A-Z]+$/,I=/\b__p\+='';/g,R=/\b(__p\+=)''\+/g,N=/(__e\(.*?\)|\b__t\))\+'';/g,S=/&(?:amp|lt|gt|quot|#39);/g,T=/[&<>"']/g,W=/<%-([\s\S]+?)%>/g,F=/<%([\s\S]+?)%>/g,$=/<%=([\s\S]+?)%>/g,z=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,D=/\w*$/,L=/^\s*function[ \n\r\t]+\w/,B=/^0[xX]/,q=/[\xC0-\xFF]/g,U=/($^)/,Z=/[.*+?^${}()|[\]\/\\]/g,P=/\bthis\b/,K=/['\n\r\u2028\u2029\\]/g,M=/[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[a-z]+|[0-9]+/g,V=" \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",J="Array Boolean Date Function Math Number Object RegExp Set String _ clearTimeout document isFinite isNaN parseInt setTimeout TypeError window WinRTError".split(" "),X="[object Arguments]",Y="[object Array]",G="[object Boolean]",H="[object Date]",Q="[object Error]",nt="[object Function]",tt="[object Number]",et="[object Object]",rt="[object RegExp]",ut="[object String]",ot={}; +}return t}function g(n){for(var t=n.length;t--;){var e=n.charCodeAt(t);if((160e||13e||8202>>0:0,u=$e(r);++ei(t,f)&&l.push(f);return l}function mt(n,t){var e=-1,r=n?n.length:0;if(typeof r=="number"&&-1a(p,h)&&((u||l)&&p.push(h),c.push(s))}return c}function Rt(n,t){for(var e=-1,r=t(n),u=r.length,o=$e(u);++eo?0:o)}function Ut(n,t,r){var u=n?n.length:0;if(typeof r=="number")r=0>r?br(u+r,0):r||0;else if(r)return r=Vt(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,o=0;for(t=c.createCallback(t,e,3);u--&&t(n[u],u,n);)o++ +}else o=null==t||e?1:t;return o=r-(o||0),Mt(n,0,0>o?0:o)}function Pt(n,t,e){var r=n?n.length:0;if(typeof t!="number"&&null!=t){var u=r,o=0;for(t=c.createCallback(t,e,3);u--&&t(n[u],u,n);)o++}else if(o=t,null==o||e)return n?n[r-1]:m;return o=r-(o||0),Mt(n,0>o?0:o)}function Kt(n,t,e){if(typeof t!="number"&&null!=t){var r=-1,u=n?n.length:0,o=0;for(t=c.createCallback(t,e,3);++rt?0:t;return Mt(n,o)}function Mt(n,t,e){var r=-1,u=n?n.length:0;for(t=typeof t=="undefined"?0:+t||0,0>t?t=br(u+t,0):t>u&&(t=u),e=typeof e=="undefined"?u:+e||0,0>e?e=br(u+e,0):e>u&&(e=u),u=t>e?0:e-t,e=$e(u);++r>>1,e(n[r])e?0:e);++te?br(r+e,0):e||0:0,typeof n=="string"||!Sr(n)&&ke(n)?eo&&(o=a)}else t=null==t&&ke(n)?u:c.createCallback(t,e,3),mt(n,function(n,e,u){e=t(n,e,u),(e>r||-1/0===e&&e===o)&&(r=e,o=n)});return o}function ie(n,t){return ue(n,Fe(t))}function ae(n,t,e,r){var u=3>arguments.length;t=c.createCallback(t,r,4);var o=-1,i=n?n.length:0;if(typeof i=="number"&&-1arguments.length;return t=c.createCallback(t,r,4),dt(n,function(n,r,o){e=u?(u=false,n):t(e,n,r,o) +}),e}function le(n){var t=-1,e=n&&n.length,r=$e(0>e?0:e>>>0);return mt(n,function(n){var e=Et(0,++t);r[t]=r[e],r[e]=n}),r}function ce(n,t,e){var r;t=c.createCallback(t,e,3),e=-1;var u=n?n.length:0;if(typeof u=="number"&&-1arguments.length)return Wt(n,d,null,t);if(n)var e=n[C]?n[C][2]:n.length,r=Mt(arguments,2),e=e-r.length;return Wt(n,d|j,e,t,r)}function se(n,t,e){function r(){c&&tr(c),i=c=p=m,(g||h!==t)&&(s=Dr(),a=n.apply(l,o),c||i||(o=l=null)) +}function u(){var e=t-(Dr()-f);0>=e||e>t?(i&&tr(i),e=p,i=c=p=m,e&&(s=Dr(),a=n.apply(l,o),c||i||(o=l=null))):c=lr(u,e)}var o,i,a,f,l,c,p,s=0,h=false,g=true;if(!be(n))throw new Ke(O);if(t=0>t?0:t,true===e)var v=true,g=false;else _e(e)&&(v=e.leading,h="maxWait"in e&&br(t,+e.maxWait||0),g="trailing"in e?e.trailing:g);return function(){if(o=arguments,f=Dr(),l=this,p=g&&(c||!v),false===h)var e=v&&!c;else{i||v||(s=f);var y=h-(f-s),m=0>=y||y>h;m?(i&&(i=tr(i)),s=f,a=n.apply(l,o)):i||(i=lr(r,y))}return m&&c?c=tr(c):c||t===h||(c=lr(u,t)),e&&(m=true,a=n.apply(l,o)),!m||c||i||(o=l=null),a +}}function he(n){if(!be(n))throw new Ke(O);return function(){return!n.apply(this,arguments)}}function ge(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),3>>0,r=n.constructor,u=-1,r=r&&n===r.prototype,o=e-1,i=$e(e),a=0t||null==n||!yr(t))return e;n=Pe(n);do t%2&&(e+=n),t=er(t/2),n+=n;while(t);return e}function Ie(n,t){return(n=null==n?"":Pe(n))?null==t?n.slice(h(n),g(n)+1):(t=Pe(t),n.slice(o(n,t),i(n,t)+1)):n}function Re(n,t,e){var r=typeof n;return"function"==r||null==n?(typeof t=="undefined"||!("prototype"in n))&&n||st(n,t,e):"object"==r?Se(n):Fe(n) +}function Ne(n){return n}function Se(n){var t=Wr(n),e=t.length,r=t[0],u=e&&n[r];return 1!=e||u!==u||_e(u)?function(r){var u=e;if(u&&!r)return false;for(var o=true;u--&&(o=t[u],o=or.call(r,o)&&Ot(r[o],n[o],null,true)););return o}:function(n){return n&&or.call(n,r)?(n=n[r],u===n&&(0!==u||1/u==1/n)):false}}function Te(n,t,e){var r=true,u=t&&ye(t);t&&(e||u.length)||(null==e&&(e=t),t=n,n=this,u=ye(t)),false===e?r=false:_e(e)&&"chain"in e&&(r=e.chain),e=-1;for(var o=be(n),i=u?u.length:0;++e--n?t.apply(this,arguments):void 0 +}},c.assign=ge,c.at=function(n,t){var e=arguments,r=-1,u=_t(e,true,false,1),o=u.length,i=typeof t;for("number"!=i&&"string"!=i||!e[2]||e[2][t]!==n||(o=1),e=$e(o);++rarguments.length?Wt(t,d|b,null,n):Wt(t,d|b|j,null,n,Mt(arguments,2))},c.chain=function(n){return new q(n,true)},c.compact=function(n){for(var t=-1,e=n?n.length:0,r=0,u=[];++t(s?r(s,f):i(p,f))){for(t=u;--t;){var h=o[t];if(0>(h?r(h,f):i(n[t],f)))continue n}s&&s.push(f),p.push(f)}return p},c.invert=function(n,t){for(var e=-1,r=Wr(n),u=r.length,o={};++eo?0:o>>>0);return mt(n,function(n){var o=u?t:null!=n&&n[t];i[++r]=o?o.apply(n,e):m +}),i},c.keys=Wr,c.keysIn=xe,c.map=ue,c.mapValues=function(n,t,e){var r={};return t=c.createCallback(t,e,3),xt(n,function(n,e,u){r[e]=t(n,e,u)}),r},c.matches=Se,c.max=oe,c.memoize=function(n,t){function e(){var r=e.cache,u=t?t.apply(this,arguments):"_"+arguments[0];return or.call(r,u)?r[u]:r[u]=n.apply(this,arguments)}if(!be(n)||t&&!be(t))throw new Ke(O);return e.cache={},e},c.merge=function(n,t,e){var r=arguments,u=r.length,o=typeof e;if(!n||2>u)return n;if("number"!=o&&"string"!=o||!r[3]||r[3][e]!==t||(u=2),3u?0:u>>>0);for(o||(t=c.createCallback(t,e,3)),mt(n,function(n,e,u){if(o)for(e=t.length,u=$e(e);e--;)u[e]=n[t[e]];else u=t(n,e,u);i[++r]={a:u,b:r,c:n}}),u=i.length,i.sort(o?f:a);u--;)i[u]=i[u].c;return i},c.tap=function(n,t,e){return t.call(e,n),n},c.throttle=function(n,t,e){var r=true,u=true;if(!be(n))throw new Ke(O); +return false===e?r=false:_e(e)&&(r="leading"in e?!!e.leading:r,u="trailing"in e?!!e.trailing:u),it.leading=r,it.maxWait=+t,it.trailing=u,se(n,t,it)},c.times=function(n,t,e){n=0>n?0:n>>>0,t=st(t,e,1),e=-1;for(var r=$e(n);++ee?0:+e||0,r))-t.length,0<=e&&n.indexOf(t,e)==e},c.escape=function(n){return null==n?"":Pe(n).replace(T,p)},c.escapeRegExp=Ae,c.every=Qt,c.find=te,c.findIndex=Bt,c.findKey=function(n,t,e){return t=c.createCallback(t,e,3),bt(n,t,xt,true) +},c.findLast=function(n,t,e){return t=c.createCallback(t,e,3),bt(n,t,dt)},c.findLastIndex=function(n,t,e){var r=n?n.length:0;for(t=c.createCallback(t,e,3);r--;)if(t(n[r],r,n))return r;return-1},c.findLastKey=function(n,t,e){return t=c.createCallback(t,e,3),bt(n,t,Ct,true)},c.findWhere=function(n,t){return te(n,Se(t))},c.has=function(n,t){return n?or.call(n,t):false},c.identity=Ne,c.indexOf=Ut,c.isArguments=me,c.isArray=Sr,c.isBoolean=function(n){return true===n||false===n||n&&typeof n=="object"&&He.call(n)==G||false +},c.isDate=function(n){return n&&typeof n=="object"&&He.call(n)==H||false},c.isElement=de,c.isEmpty=function(n){var t=true;if(!n)return t;var e=n.length;return-1e?br(r+e,0):_r(e||0,r-1))+1);r--;)if(n[r]===t)return r;return-1},c.noConflict=function(){return t._=Ye,this},c.noop=We,c.now=Dr,c.pad=function(n,t,e){n=null==n?"":Pe(n),t=+t; +var r=n.length;return re?0:+e||0,n.length),n.lastIndexOf(t,e)==e},c.template=function(n,t,e){var r=c.templateSettings;e=ve({},e,r),n=Pe(null==n?"":n);var u,o,i=ve({},e.imports,r.imports),r=Wr(i),i=Oe(i),a=0,f=e.interpolate||U,l="__p+='",f=Ze((e.escape||U).source+"|"+f.source+"|"+(f===$?z:U).source+"|"+(e.evaluate||U).source+"|$","g"); +n.replace(f,function(t,e,r,i,f,c){return r||(r=i),l+=n.slice(a,c).replace(K,s),e&&(u=true,l+="'+__e("+e+")+'"),f&&(o=true,l+="';"+f+";\n__p+='"),r&&(l+="'+((__t=("+r+"))==null?'':__t)+'"),a=c+t.length,t}),l+="';",(e=e.variable)||(l="with(obj){"+l+"}"),l=(o?l.replace(I,""):l).replace(R,"$1").replace(N,"$1;"),l="function("+(e||"obj")+"){"+(e?"":"obj||(obj={});")+"var __t,__p=''"+(u?",__e=_.escape":"")+(o?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+l+"return __p}";try{var p=Le(r,"return "+l).apply(m,i) +}catch(h){throw h.source=l,h}return t?p(t):(p.source=l,p)},c.trim=Ie,c.trimLeft=function(n,t){return(n=null==n?"":Pe(n))?null==t?n.slice(h(n)):(t=Pe(t),n.slice(o(n,t))):n},c.trimRight=function(n,t){return(n=null==n?"":Pe(n))?null==t?n.slice(0,g(n)+1):(t=Pe(t),n.slice(0,i(n,t)+1)):n},c.truncate=function(n,t){var e=30,r="...";if(t&&_e(t))var u="separator"in t?t.separator:u,e="length"in t?+t.length||0:e,r="omission"in t?Pe(t.omission):r;else null!=t&&(e=+t||0);if(n=null==n?"":Pe(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(je(u)){if(n.slice(o).search(u)){var i,a,f=n.slice(0,o);for(u.global||(u=Ze(u.source,(D.exec(u)||"")+"g")),u.lastIndex=0;i=u.exec(f);)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(S,v))},c.uniqueId=function(n){var t=++A;return Pe(null==n?"":n)+t},c.all=Qt,c.any=ce,c.detect=te,c.foldl=ae,c.foldr=fe,c.include=Ht,c.inject=ae,Te(c,function(){var n={}; +return xt(c,function(t,e){c.prototype[e]||(n[e]=t)}),n}(),false),c.first=qt,c.last=Pt,c.sample=function(n,t,e){return n&&typeof n.length!="number"&&(n=Oe(n)),null==t||e?(t=n?n.length:0,0t?0:+t||0,n.length),n)},c.take=qt,c.takeRight=Pt,c.takeRightWhile=Pt,c.takeWhile=qt,c.head=qt,xt(c,function(n,t){var e="sample"!==t;c.prototype[t]||(c.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 q(o,u):o +})}),c.VERSION=x,c.prototype.chain=function(){return this.__chain__=true,this},c.prototype.toJSON=Gt,c.prototype.toString=function(){return Pe(this.__wrapped__)},c.prototype.value=Gt,c.prototype.valueOf=Gt,M(["join","pop","shift"],function(n){var t=Me[n];c.prototype[n]=function(){var n=this.__chain__,e=t.apply(this.__wrapped__,arguments);return n?new q(e,n):e}}),M(["push","reverse","sort","unshift"],function(n){var t=Me[n];c.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),M(["concat","splice"],function(n){var t=Me[n]; +c.prototype[n]=function(){return new q(t.apply(this.__wrapped__,arguments),this.__chain__)}}),c}var m,d=1,b=2,_=4,w=8,j=16,k=32,x="2.4.1",C="__lodash@"+x+"__",O="Expected a function",A=0,E=/^[A-Z]+$/,I=/\b__p\+='';/g,R=/\b(__p\+=)''\+/g,N=/(__e\(.*?\)|\b__t\))\+'';/g,S=/&(?:amp|lt|gt|quot|#39);/g,T=/[&<>"']/g,W=/<%-([\s\S]+?)%>/g,F=/<%([\s\S]+?)%>/g,$=/<%=([\s\S]+?)%>/g,z=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,D=/\w*$/,L=/^\s*function[ \n\r\t]+\w/,B=/^0[xX]/,q=/[\xC0-\xFF]/g,U=/($^)/,Z=/[.*+?^${}()|[\]\/\\]/g,P=/\bthis\b/,K=/['\n\r\u2028\u2029\\]/g,M=/[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[a-z]+|[0-9]+/g,V=" \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",J="Array Boolean Date Function Math Number Object RegExp Set String _ clearTimeout document isFinite isNaN parseInt setTimeout TypeError window WinRTError".split(" "),X="[object Arguments]",Y="[object Array]",G="[object Boolean]",H="[object Date]",Q="[object Error]",nt="[object Function]",tt="[object Number]",et="[object Object]",rt="[object RegExp]",ut="[object String]",ot={}; ot[nt]=false,ot[X]=ot[Y]=ot[G]=ot[H]=ot[tt]=ot[et]=ot[rt]=ot[ut]=true;var it={leading:false,maxWait:0,trailing:false},at={configurable:false,enumerable:false,value:null,writable:false},ft={"&":"&","<":"<",">":">",'"':""","'":"'"},lt={"&":"&","<":"<",">":">",""":'"',"'":"'"},ct={\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":" "},pt={"function":true,object:true},st={"\\":"\\","'":"'","\n":"n","\r":"r","\u2028":"u2028","\u2029":"u2029"},ht=pt[typeof window]&&window||this,gt=pt[typeof exports]&&exports&&!exports.nodeType&&exports,pt=pt[typeof module]&&module&&!module.nodeType&&module,vt=gt&&pt&&typeof global=="object"&&global; !vt||vt.global!==vt&&vt.window!==vt&&vt.self!==vt||(ht=vt);var vt=pt&&pt.exports===gt&>,yt=y();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(ht._=yt, define(function(){return yt})):gt&&pt?vt?(pt.exports=yt)._=yt:gt._=yt:ht._=yt}).call(this); \ No newline at end of file diff --git a/dist/lodash.underscore.js b/dist/lodash.underscore.js index 3f374ac20..8a2203859 100644 --- a/dist/lodash.underscore.js +++ b/dist/lodash.underscore.js @@ -284,12 +284,12 @@ * `flatten`, `forEach`, `forEachRight`, `forIn`, `forInRight`, `forOwn`, * `forOwnRight`, `functions`, `groupBy`, `indexBy`, `initial`, `intersection`, * `invert`, `invoke`, `keys`, `map`, `mapValues`, `matches`, `max`, `memoize`, - * `merge`, `min`, `noop`, `object`, `omit`, `once`, `pairs`, `partial`, - * `partialRight`, `pick`, `pluck`, `property`, `pull`, `push`, `range`, - * `reject`, `remove`, `rest`, `reverse`, `shuffle`, `slice`, `sort`, `sortBy`, - * `splice`, `tap`, `throttle`, `times`, `toArray`, `transform`, `union`, - * `uniq`, `unshift`, `unzip`, `values`, `where`, `without`, `wrap`, `xor`, - * and `zip` + * `merge`, `min`, `mixin`, `noop`, `object`, `omit`, `once`, `pairs`, + * `partial`, `partialRight`, `pick`, `pluck`, `property`, `pull`, `push`, + * `range`, `reject`, `remove`, `rest`, `reverse`, `shuffle`, `slice`, `sort`, + * `sortBy`, `splice`, `tap`, `throttle`, `times`, `toArray`, `transform`, + * `union`, `uniq`, `unshift`, `unzip`, `values`, `where`, `without`, `wrap`, + * `xor`, and `zip` * * The non-chainable wrapper functions are: * `capitalize`, `clone`, `cloneDeep`, `contains`, `escape`, `every`, `find`, @@ -297,10 +297,10 @@ * `identity`, `indexOf`, `isArguments`, `isArray`, `isBoolean`, `isDate`, * `isElement`, `isEmpty`, `isEqual`, `isFinite`, `isFunction`, `isNaN`, * `isNull`, `isNumber`, `isObject`, `isPlainObject`, `isRegExp`, `isString`, - * `isUndefined`, `join`, `lastIndexOf`, `mixin`, `noConflict`, `now`, - * `parseInt`, `pop`, `random`, `reduce`, `reduceRight`, `result`, `shift`, - * `size`, `some`, `sortedIndex`, `runInContext`, `template`, `trim`, - * `trimLeft`, `trimRight`, `unescape`, `uniqueId`, and `value` + * `isUndefined`, `join`, `lastIndexOf`, `noConflict`, `now`, `parseInt`, + * `pop`, `random`, `reduce`, `reduceRight`, `result`, `shift`, `size`, `some`, + * `sortedIndex`, `runInContext`, `template`, `trim`, `trimLeft`, `trimRight`, + * `unescape`, `uniqueId`, and `value` * * The wrapper functions `first`, `last`, and `sample` return wrapped values * when `n` is provided, otherwise they return unwrapped values. @@ -1667,17 +1667,17 @@ * // => 2 * * var dict = { - * 'wordToNumber': { 'twenty': 20, 'thirty': 30, 'fourty': 40, 'fifty': 50 } + * 'wordToNumber': { 'twenty': 20, 'thirty': 30, 'forty': 40, 'fifty': 50 } * }; * * // using `callback` - * _.sortedIndex(['twenty', 'thirty', 'fifty'], 'fourty', function(word) { + * _.sortedIndex(['twenty', 'thirty', 'fifty'], 'forty', function(word) { * return dict.wordToNumber[word]; * }); * // => 2 * * // using `callback` with `thisArg` - * _.sortedIndex(['twenty', 'thirty', 'fifty'], 'fourty', function(word) { + * _.sortedIndex(['twenty', 'thirty', 'fifty'], 'forty', function(word) { * return this.wordToNumber[word]; * }, dict); * // => 2 @@ -4877,11 +4877,12 @@ * @static * @memberOf _ * @category Utilities - * @param {Function|Object} [object=lodash] object The destination object. + * @param {Function|Object} [object=this] object The destination object. * @param {Object} source The object of functions to add. * @param {Object} [options] The options object. * @param {boolean} [options.chain=true] Specify whether the functions added * are chainable. + * @returns {Function|Object} Returns `object`. * @example * * function vowels(string) { @@ -5213,6 +5214,7 @@ lodash.max = max; lodash.memoize = memoize; lodash.min = min; + lodash.mixin = mixin; lodash.omit = omit; lodash.once = once; lodash.pairs = pairs; @@ -5277,7 +5279,6 @@ lodash.isString = isString; lodash.isUndefined = isUndefined; lodash.lastIndexOf = lastIndexOf; - lodash.mixin = mixin; lodash.noConflict = noConflict; lodash.now = now; lodash.random = random; diff --git a/dist/lodash.underscore.min.js b/dist/lodash.underscore.min.js index 8de7ef3f9..9708bc21e 100644 --- a/dist/lodash.underscore.min.js +++ b/dist/lodash.underscore.min.js @@ -28,12 +28,12 @@ return n=nt(n=+n)?n:0,function(){return 1>--n?r.apply(this,arguments):void 0}},o return e}},o.constant=function(n){return function(){return n}},o.countBy=lt,o.debounce=H,o.defaults=L,o.defer=function(n){if(!Y(n))throw new TypeError(vr);var r=N(arguments,1);return setTimeout(function(){n.apply(lr,r)},1)},o.delay=function(n,r){if(!Y(n))throw new TypeError(vr);var t=N(arguments,2);return setTimeout(function(){n.apply(lr,t)},r)},o.difference=function(){for(var n=-1,r=arguments.length;++nr?0:r)},o.intersection=function(){for(var n=[],r=-1,t=arguments.length;++ri(a,e)){for(r=t;--r;)if(0>i(n[r],e))continue n;a.push(e)}return a},o.invert=function(n){for(var r=-1,t=vt(n),e=t.length,u={};++ro?0:o>>>0);return g(n,function(n){var o=u?r:null!=n&&n[r];i[++e]=o?o.apply(n,t):lr}),i},o.keys=vt,o.map=D,o.matches=fr,o.max=W,o.memoize=function(n,r){if(!Y(n)||r&&!Y(r))throw new TypeError(vr);var t={};return function(){var e=r?r.apply(this,arguments):"_"+arguments[0];return Kr.call(t,e)?t[e]:t[e]=n.apply(this,arguments)}},o.min=function(n,r,t){var e=1/0,u=e,o=typeof r;"number"!=o&&"string"!=o||!t||t[r]!==n||(r=null); -var o=-1,i=n?n.length:0;if(null==r&&typeof i=="number"&&-1o?0:o>>>0);for(t=or(t,e,3),g(n,function(n,r,e){i[++u]={a:t(n,r,e),b:u,c:n}}),o=i.length,i.sort(r);o--;)i[o]=i[o].c; return i},o.tap=function(n,r){return r(n),n},o.throttle=function(n,r,t){var e=true,u=true;if(!Y(n))throw new TypeError(vr);return false===t?e=false:Z(t)&&(e="leading"in t?t.leading:e,u="trailing"in t?t.trailing:u),H(n,r,{leading:e,maxWait:r,trailing:u})},o.times=function(n,r,t){n=0>n?0:n>>>0,r=l(r,t,1),t=-1;for(var e=Array(n);++tr?0:r);++nt?et(e+t,0):ut(t||0,e-1))+1);e--;)if(n[e]===r)return e;return-1},o.mixin=ar,o.noConflict=function(){return Mr._=Cr,this +return true},o.isEqual=function(n,r){return d(n,r)},o.isFinite=function(n){return nt(n)&&!rt(parseFloat(n))},o.isFunction=Y,o.isNaN=function(n){return nr(n)&&n!=+n},o.isNull=function(n){return null===n},o.isNumber=nr,o.isObject=Z,o.isRegExp=function(n){return Z(n)&&Ur.call(n)==kr||false},o.isString=rr,o.isUndefined=function(n){return typeof n=="undefined"},o.lastIndexOf=function(n,r,t){var e=n?n.length:0;for(typeof t=="number"&&(e=(0>t?et(e+t,0):ut(t||0,e-1))+1);e--;)if(n[e]===r)return e;return-1},o.noConflict=function(){return Mr._=Cr,this },o.now=yt,o.random=function(n,r){return null==n&&null==r&&(r=1),n=+n||0,null==r?(r=n,n=0):r=+r||0,n+Hr(it()*(r-n+1))},o.reduce=C,o.reduceRight=P,o.result=function(n,r){if(null!=n){var t=n[r];return Y(t)?n[r]():t}},o.size=function(n){var r=n?n.length:0;return typeof r=="number"&&-1n.indexOf(";")?n:n.replace(mr,u))},o.uniqueId=function(n){var r=++yr+"";return n?n+r:r},o.all=M,o.any=V,o.detect=$,o.foldl=C,o.foldr=P,o.include=B,o.inject=C,o.first=O,o.last=function(n,r,t){var e=n?n.length:0; return null==r||t?n?n[e-1]:lr:(r=e-(r||0),N(n,0>r?0:r))},o.sample=function(n,r,t){return n&&typeof n.length!="number"&&(n=ur(n)),null==r||t?(r=n?n.length:0,0r?0:+r||0,n.length),n)},o.take=ct,o.head=O,ar(K({},o)),o.VERSION="2.4.1",o.prototype.chain=function(){return this.__chain__=true,this},o.prototype.value=function(){return this.__wrapped__},f("pop push reverse shift sort splice unshift".split(" "),function(n){var r=Wr[n];o.prototype[n]=function(){var n=this.__wrapped__;