From 3d311496e017333fb6a3dcbb60b47612bc4b99dc Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Sat, 15 Feb 2014 13:39:03 -0800 Subject: [PATCH] Remove placeholder support from non-underscore builds. --- dist/lodash.compat.js | 26 +-------- dist/lodash.compat.min.js | 112 +++++++++++++++++++------------------- dist/lodash.js | 26 +-------- dist/lodash.min.js | 103 +++++++++++++++++------------------ lodash.js | 2 +- 5 files changed, 114 insertions(+), 155 deletions(-) diff --git a/dist/lodash.compat.js b/dist/lodash.compat.js index 371d8c99f..833eea0f0 100644 --- a/dist/lodash.compat.js +++ b/dist/lodash.compat.js @@ -1919,7 +1919,7 @@ * @param {Array} [partialRightArgs] An array of arguments to append to those * provided to the new function. * @param {Array} [partialHolders] An array of `partialArgs` placeholder indexes. - * @param {Array} [partialRightArgs] An array of `partialRightArgs` placeholder indexes. + * @param {Array} [partialRightHolders] An array of `partialRightArgs` placeholder indexes. * @returns {Function} Returns the new function. */ function createWrapper(func, bitmask, arity, thisArg, partialArgs, partialRightArgs, partialHolders, partialRightHolders) { @@ -1991,10 +1991,10 @@ arity = 0; } if (isPartial) { - partialHolders = getHolders(partialArgs); + partialHolders = []; } if (isPartialRight) { - partialRightHolders = getHolders(partialRightArgs); + partialRightHolders = []; } // fast path for `_.bind` data = [func, bitmask, arity, thisArg, partialArgs, partialRightArgs, partialHolders, partialRightHolders]; @@ -2031,26 +2031,6 @@ ); } - /** - * Finds the indexes of all placeholder elements in a given array. - * - * @private - * @param {Array} array The array to inspect. - * @returns {Array} Returns a 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 method returns the custom method, otherwise it returns diff --git a/dist/lodash.compat.min.js b/dist/lodash.compat.min.js index 42e37e899..2d402018c 100644 --- a/dist/lodash.compat.min.js +++ b/dist/lodash.compat.min.js @@ -5,61 +5,61 @@ */ ;(function(){function n(n,t){if(n!==t){if(n>t||typeof n=="undefined")return 1;if(ne||13e||8202r||13r||8202=S&&(o=r,e=se(e));++uo(e,l)&&i.push(l)}return i}function ht(n,t){var r=-1,e=n,u=n?n.length:0;if(typeof u=="number")for(pe.unindexedChars&&cr(e)&&(e=e.split(""));++r=S,f=[];if(l)var p=se(),a=r;else p=u?c():f;for(;++oa(p,h))&&((u||l)&&p.push(h),f.push(g)) -}return!l&&u&&s(p),f}function kt(n,t,r){for(var e=-1,u=t.length,o=-1,a=n.length,i=te(r.length-u,0),l=dr(i+a);++or&&(r=0),c&&(a=At(u)),p&&(i=At(o)),s=[n,t,r,e,u,o,a,i],t==j||t==(j|O)?m(s):st(s))}function St(n){n.d=Y;var t=wr,r="return function("+n.a+"){",e="var r="+n.b+";if(!j(p)){return r}";pe.nonEnumArgs&&(e+="var m=p.length;if(m&&i(p)){l=-1;while(++lu;u++)e+="l='"+n.d[u]+"';if((!(k&&n[l])&&g.call(p,l))",n.e||(e+="||(!n[l]&&p[l]!==q[l])"),e+="){"+n.c+"}";e+="}"}return t("e,f,g,i,j,q,o,u,v,w",r+(e+"return r;")+"}")(et,Ar,Wr,Tt,lr,Ir,ce,lt,Nr,Pr) -}function At(n){for(var t=-1,r=n.length,e=[];++te?te(0,u+e):e||0;else if(e)return e=Lt(n,r),u&&n[e]===r?e:-1;return t(n,r,e)}function Ft(n,t,r){if(typeof t!="number"&&null!=t){var e=0,o=-1,a=n?n.length:0;for(t=u.createCallback(t,r,3);++ot?t=te(u+t,0):t>u&&(t=u),typeof r=="undefined"?r=u:0>r?r=te(u+r,0):r>u&&(r=u),u=r-t||0,r=dr(u);++e>>1,r(n[e])r?0:r);++t=e)return false;if(typeof n=="string"||!we(n)&&cr(n))return Gr?Gr.call(n,t,r):-1r?te(0,e+r):r)||0,-1a&&(a=l)}else t=null==t&&cr(n)?e:u.createCallback(t,r,3),ht(n,function(n,r,e){r=t(n,r,e),r>o&&(o=r,a=n)});return a}function Qt(n,t,r,e){var o=3>arguments.length;if(t=u.createCallback(t,e,4),we(n)){var a=-1,i=n.length;for(o&&i&&(r=n[++a]);++aarguments.length;return t=u.createCallback(t,e,4),vt(n,function(n,e,u){r=o?(o=false,n):t(r,n,e,u)}),r}function Zt(n){var t=-1,r=n?n.length:0,e=dr(typeof r=="number"?r:0);return ht(n,function(n){var r=xt(0,++t);e[t]=e[r],e[r]=n}),e}function nr(n,t,r){var e;if(t=u.createCallback(t,r,3),we(n)){r=-1;for(var o=n.length;++rarguments.length)return Et(n,j,null,t); -if(n)var r=n[N]?n[N][2]:n.length,e=$t(arguments,2),r=r-e.length;return Et(n,j|O,r,t,e)}function rr(n,t,r){var e,u,o,a,i,l,f,c=0,p=false,s=true;if(!ir(n))throw new Er;if(t=te(0,t)||0,true===r)var g=true,s=false;else lr(r)&&(g=r.leading,p="maxWait"in r&&(te(t,r.maxWait)||0),s="trailing"in r?r.trailing:s);var h=function(){var r=t-(Ee()-a);0>=r||r>t?(u&&$r(u),r=f,u=l=f=w,r&&(c=Ee(),o=n.apply(i,e),l||u||(e=i=null))):l=Ur(h,r)},v=function(){l&&$r(l),u=l=f=w,(s||p!==t)&&(c=Ee(),o=n.apply(i,e),l||u||(e=i=null))};return function(){if(e=arguments,a=Ee(),i=this,f=s&&(l||!g),false===p)var r=g&&!l; -else{u||g||(c=a);var y=p-(a-c),m=0>=y||y>p;m?(u&&(u=$r(u)),c=a,o=n.apply(i,e)):u||(u=Ur(v,y))}return m&&l?l=$r(l):l||t===p||(l=Ur(h,t)),r&&(m=true,o=n.apply(i,e)),!m||l||u||(e=i=null),o}}function er(n,t,r){var e=arguments,u=0,o=e.length,a=typeof r;if("number"!=a&&"string"!=a||!e[3]||e[3][r]!==t||(o=2),3--n?t.apply(this,arguments):void 0}},u.assign=er,u.at=function(n,t){var r=arguments,e=-1,u=mt(r,true,false,1),o=u.length,a=typeof t;for("number"!=a&&"string"!=a||!r[2]||r[2][t]!==n||(o=1),pe.unindexedChars&&cr(n)&&(n=n.split("")),r=dr(o);++earguments.length?Et(t,j|x,null,n):Et(t,j|x|O,null,n,$t(arguments,2))},u.chain=function(n){return n=new o(n),n.__chain__=true,n},u.compact=function(n){for(var t=-1,r=n?n.length:0,e=0,u=[];++t=S&&se(e?n[e]:l)))}var i=n[0],p=-1,g=i?i.length:0,h=[]; -n:for(;++p(v?r(v,f):a(l,f))){for(e=u,(v||l).push(f);--e;)if(v=o[e],0>(v?r(v,f):a(n[e],f)))continue n;h.push(f)}}return s(o),s(l),h},u.invert=function(n,t){for(var r=-1,e=xe(n),u=e.length,o={};++rarguments.length&&we(n))for(;++rr?te(0,e+r):re(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},u.mixin=vr,u.noConflict=function(){return n._=Tr,this},u.noop=yr,u.now=Ee,u.parseInt=Se,u.random=function(n,t,r){var e=null==n,u=null==t;return null==r&&(u&&typeof n=="boolean"?(r=n,n=1):typeof t=="boolean"&&(r=t,u=true)),e&&u&&(t=1,u=false),n=+n||0,u?(t=n,n=0):t=+t||0,r||n%1||t%1?(r=oe(),re(n+r*(t-n+parseFloat("1e-"+((r+"").length-1))),t)):xt(n,t) -},u.reduce=Qt,u.reduceRight=Yt,u.result=function(n,t,r){var e=null==n?w:n[t];return typeof e=="undefined"?r:ir(e)?n[t]():e},u.runInContext=_,u.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:xe(n).length},u.some=nr,u.sortedIndex=Lt,u.template=function(n,t,r){var e=u.templateSettings;n=Or(n||""),r=ur({},r,e);var o,a=ur({},r.imports,e.imports),e=xe(a),a=pr(a),i=0,l=r.interpolate||U,c="__p+='",l=kr((r.escape||U).source+"|"+l.source+"|"+(l===D?W:U).source+"|"+(r.evaluate||U).source+"|$","g"); -n.replace(l,function(t,r,e,u,a,l){return e||(e=u),c+=n.slice(i,l).replace(H,f),r&&(c+="'+__e("+r+")+'"),a&&(o=true,c+="';"+a+";\n__p+='"),e&&(c+="'+((__t=("+e+"))==null?'':__t)+'"),i=l+t.length,t}),c+="';",l=r=r.variable,l||(r="obj",c="with("+r+"){"+c+"}"),c=(o?c.replace(T,""):c).replace(P,"$1").replace(q,"$1;"),c="function("+r+"){"+(l?"":r+"||("+r+"={});")+"var __t,__p='',__e=_.escape"+(o?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+c+"return __p}";try{var p=wr(e,"return "+c).apply(w,a) -}catch(s){throw s.source=c,s}return t?p(t):(p.source=c,p)},u.trim=Ce,u.trimLeft=ke,u.trimRight=Oe,u.unescape=function(n){return null==n?"":(n=Or(n),0>n.indexOf(";")?n:n.replace(F,b))},u.uniqueId=function(n){var t=++R;return Or(null==n?"":n)+t},u.all=Mt,u.any=nr,u.detect=Vt,u.findWhere=Vt,u.foldl=Qt,u.foldr=Yt,u.include=Kt,u.inject=Qt,vr(function(){var n={};return dt(u,function(t,r){u.prototype[r]||(n[r]=t)}),n}(),false),u.first=Pt,u.last=function(n,t,r){var e=0,o=n?n.length:0;if(typeof t!="number"&&null!=t){var a=o; -for(t=u.createCallback(t,r,3);a--&&t(n[a],a,n);)e++}else if(e=t,null==e||r)return n?n[o-1]:w;return e=o-e,$t(n,0"']/g,L=/<%-([\s\S]+?)%>/g,B=/<%([\s\S]+?)%>/g,D=/<%=([\s\S]+?)%>/g,W=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,z=/\w*$/,K=/^\s*function[ \n\r\t]+\w/,M=/^0[xX]/,U=/($^)/,V=/\bthis\b/,H=/['\n\r\t\u2028\u2029\\]/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",G=[],J=[],Q="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(" "),Z="[object Arguments]",nt="[object Array]",tt="[object Boolean]",rt="[object Date]",et="[object Error]",ut="[object Function]",ot="[object Number]",at="[object Object]",it="[object RegExp]",lt="[object String]",ft={}; +}function m(n){for(var t=-1,r=n.length;++te||13e||8202r||13r||8202=S&&(o=r,e=pe(e));++uo(e,l)&&i.push(l)}return i}function ht(n,t){var r=-1,e=n,u=n?n.length:0;if(typeof u=="number")for(ce.unindexedChars&&fr(e)&&(e=e.split(""));++r=S,f=[];if(l)var p=pe(),a=r;else p=u?c():f;for(;++oa(p,h))&&((u||l)&&p.push(h),f.push(g)) +}return!l&&u&&s(p),f}function kt(n,t,r){for(var e=-1,u=t.length,o=-1,a=n.length,i=ne(r.length-u,0),l=mr(i+a);++or&&(r=0),c&&(a=[]),p&&(i=[]),s=[n,t,r,e,u,o,a,i],t==j||t==(j|O)?m(s):st(s))}function St(n){n.d=Y;var t=_r,r="return function("+n.a+"){",e="var r="+n.b+";if(!j(p)){return r}";ce.nonEnumArgs&&(e+="var m=p.length;if(m&&i(p)){l=-1;while(++lu;u++)e+="l='"+n.d[u]+"';if((!(k&&n[l])&&g.call(p,l))",n.e||(e+="||(!n[l]&&p[l]!==q[l])"),e+="){"+n.c+"}";e+="}"}return t("e,f,g,i,j,q,o,u,v,w",r+(e+"return r;")+"}")(et,Sr,Dr,Rt,ir,Ar,fe,lt,Ir,Tr) +}function At(){var n=(n=u.indexOf)===Pt?t:n;return n}function It(n){return typeof n=="function"&&Pr.test(Lr.call(n))}function Nt(n){var t,r;return!n||Tr.call(n)!=at||!Dr.call(n,"constructor")&&(t=n.constructor,ar(t)&&!(t instanceof t))||!ce.argsClass&&Rt(n)||!ce.nodeClass&&p(n)?false:ce.ownLast?(ge(n,function(n,t,e){return r=Dr.call(e,t),false}),false!==r):(ge(n,function(n,t){r=t}),typeof r=="undefined"||Dr.call(n,r))}function Rt(n){return n&&typeof n=="object"&&typeof n.length=="number"&&Tr.call(n)==Z||false +}function Tt(n,t,r){var e=0,o=n?n.length:0;if(typeof t!="number"&&null!=t){var a=-1;for(t=u.createCallback(t,r,3);++ae?ne(0,u+e):e||0;else if(e)return e=$t(n,r),u&&n[e]===r?e:-1;return t(n,r,e)}function qt(n,t,r){if(typeof t!="number"&&null!=t){var e=0,o=-1,a=n?n.length:0;for(t=u.createCallback(t,r,3);++ot?t=ne(u+t,0):t>u&&(t=u),typeof r=="undefined"?r=u:0>r?r=ne(u+r,0):r>u&&(r=u),u=r-t||0,r=mr(u);++e>>1,r(n[e])r?0:r);++t=e)return false;if(typeof n=="string"||!_e(n)&&fr(n))return Xr?Xr.call(n,t,r):-1r?ne(0,e+r):r)||0,-1a&&(a=l)}else t=null==t&&fr(n)?e:u.createCallback(t,r,3),ht(n,function(n,r,e){r=t(n,r,e),r>o&&(o=r,a=n)});return a}function Jt(n,t,r,e){var o=3>arguments.length;if(t=u.createCallback(t,e,4),_e(n)){var a=-1,i=n.length;for(o&&i&&(r=n[++a]);++aarguments.length;return t=u.createCallback(t,e,4),vt(n,function(n,e,u){r=o?(o=false,n):t(r,n,e,u)}),r}function Yt(n){var t=-1,r=n?n.length:0,e=mr(typeof r=="number"?r:0);return ht(n,function(n){var r=xt(0,++t);e[t]=e[r],e[r]=n}),e}function Zt(n,t,r){var e;if(t=u.createCallback(t,r,3),_e(n)){r=-1;for(var o=n.length;++rarguments.length)return Et(n,j,null,t); +if(n)var r=n[N]?n[N][2]:n.length,e=Ft(arguments,2),r=r-e.length;return Et(n,j|O,r,t,e)}function tr(n,t,r){var e,u,o,a,i,l,f,c=0,p=false,s=true;if(!ar(n))throw new Or;if(t=ne(0,t)||0,true===r)var g=true,s=false;else ir(r)&&(g=r.leading,p="maxWait"in r&&(ne(t,r.maxWait)||0),s="trailing"in r?r.trailing:s);var h=function(){var r=t-(Oe()-a);0>=r||r>t?(u&&Fr(u),r=f,u=l=f=w,r&&(c=Oe(),o=n.apply(i,e),l||u||(e=i=null))):l=Mr(h,r)},v=function(){l&&Fr(l),u=l=f=w,(s||p!==t)&&(c=Oe(),o=n.apply(i,e),l||u||(e=i=null))};return function(){if(e=arguments,a=Oe(),i=this,f=s&&(l||!g),false===p)var r=g&&!l; +else{u||g||(c=a);var y=p-(a-c),m=0>=y||y>p;m?(u&&(u=Fr(u)),c=a,o=n.apply(i,e)):u||(u=Mr(v,y))}return m&&l?l=Fr(l):l||t===p||(l=Mr(h,t)),r&&(m=true,o=n.apply(i,e)),!m||l||u||(e=i=null),o}}function rr(n,t,r){var e=arguments,u=0,o=e.length,a=typeof r;if("number"!=a&&"string"!=a||!e[3]||e[3][r]!==t||(o=2),3--n?t.apply(this,arguments):void 0}},u.assign=rr,u.at=function(n,t){var r=arguments,e=-1,u=mt(r,true,false,1),o=u.length,a=typeof t;for("number"!=a&&"string"!=a||!r[2]||r[2][t]!==n||(o=1),ce.unindexedChars&&fr(n)&&(n=n.split("")),r=mr(o);++earguments.length?Et(t,j|x,null,n):Et(t,j|x|O,null,n,Ft(arguments,2))},u.chain=function(n){return n=new o(n),n.__chain__=true,n},u.compact=function(n){for(var t=-1,r=n?n.length:0,e=0,u=[];++t=S&&pe(e?n[e]:l)))}var i=n[0],p=-1,g=i?i.length:0,h=[]; +n:for(;++p(v?r(v,f):a(l,f))){for(e=u,(v||l).push(f);--e;)if(v=o[e],0>(v?r(v,f):a(n[e],f)))continue n;h.push(f)}}return s(o),s(l),h},u.invert=function(n,t){for(var r=-1,e=je(n),u=e.length,o={};++rarguments.length&&_e(n))for(;++rr?ne(0,e+r):te(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},u.mixin=hr,u.noConflict=function(){return n._=Rr,this},u.noop=vr,u.now=Oe,u.parseInt=Ee,u.random=function(n,t,r){var e=null==n,u=null==t;return null==r&&(u&&typeof n=="boolean"?(r=n,n=1):typeof t=="boolean"&&(r=t,u=true)),e&&u&&(t=1,u=false),n=+n||0,u?(t=n,n=0):t=+t||0,r||n%1||t%1?(r=ue(),te(n+r*(t-n+parseFloat("1e-"+((r+"").length-1))),t)):xt(n,t) +},u.reduce=Jt,u.reduceRight=Qt,u.result=function(n,t,r){var e=null==n?w:n[t];return typeof e=="undefined"?r:ar(e)?n[t]():e},u.runInContext=_,u.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:je(n).length},u.some=Zt,u.sortedIndex=$t,u.template=function(n,t,r){var e=u.templateSettings;n=kr(n||""),r=er({},r,e);var o,a=er({},r.imports,e.imports),e=je(a),a=cr(a),i=0,l=r.interpolate||U,c="__p+='",l=Cr((r.escape||U).source+"|"+l.source+"|"+(l===D?W:U).source+"|"+(r.evaluate||U).source+"|$","g"); +n.replace(l,function(t,r,e,u,a,l){return e||(e=u),c+=n.slice(i,l).replace(H,f),r&&(c+="'+__e("+r+")+'"),a&&(o=true,c+="';"+a+";\n__p+='"),e&&(c+="'+((__t=("+e+"))==null?'':__t)+'"),i=l+t.length,t}),c+="';",l=r=r.variable,l||(r="obj",c="with("+r+"){"+c+"}"),c=(o?c.replace(T,""):c).replace(P,"$1").replace(q,"$1;"),c="function("+r+"){"+(l?"":r+"||("+r+"={});")+"var __t,__p='',__e=_.escape"+(o?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+c+"return __p}";try{var p=_r(e,"return "+c).apply(w,a) +}catch(s){throw s.source=c,s}return t?p(t):(p.source=c,p)},u.trim=xe,u.trimLeft=Ce,u.trimRight=ke,u.unescape=function(n){return null==n?"":(n=kr(n),0>n.indexOf(";")?n:n.replace(F,b))},u.uniqueId=function(n){var t=++R;return kr(null==n?"":n)+t},u.all=Kt,u.any=Zt,u.detect=Ut,u.findWhere=Ut,u.foldl=Jt,u.foldr=Qt,u.include=zt,u.inject=Jt,hr(function(){var n={};return dt(u,function(t,r){u.prototype[r]||(n[r]=t)}),n}(),false),u.first=Tt,u.last=function(n,t,r){var e=0,o=n?n.length:0;if(typeof t!="number"&&null!=t){var a=o; +for(t=u.createCallback(t,r,3);a--&&t(n[a],a,n);)e++}else if(e=t,null==e||r)return n?n[o-1]:w;return e=o-e,Ft(n,0"']/g,L=/<%-([\s\S]+?)%>/g,B=/<%([\s\S]+?)%>/g,D=/<%=([\s\S]+?)%>/g,W=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,z=/\w*$/,K=/^\s*function[ \n\r\t]+\w/,M=/^0[xX]/,U=/($^)/,V=/\bthis\b/,H=/['\n\r\t\u2028\u2029\\]/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",G=[],J=[],Q="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(" "),Z="[object Arguments]",nt="[object Array]",tt="[object Boolean]",rt="[object Date]",et="[object Error]",ut="[object Function]",ot="[object Number]",at="[object Object]",it="[object RegExp]",lt="[object String]",ft={}; ft[ut]=false,ft[Z]=ft[nt]=ft[tt]=ft[rt]=ft[ot]=ft[at]=ft[it]=ft[lt]=true;var ct={leading:false,maxWait:0,trailing:false},pt={configurable:false,enumerable:false,value:null,writable:false},st={"&":"&","<":"<",">":">",'"':""","'":"'"},gt={"&":"&","<":"<",">":">",""":'"',"'":"'"},ht={"function":true,object:true},vt={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},yt=ht[typeof window]&&window||this,mt=ht[typeof exports]&&exports&&!exports.nodeType&&exports,ht=ht[typeof module]&&module&&!module.nodeType&&module,dt=mt&&ht&&typeof global=="object"&&global; !dt||dt.global!==dt&&dt.window!==dt&&dt.self!==dt||(yt=dt);var dt=ht&&ht.exports===mt&&mt,bt=_();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(yt._=bt, define(function(){return bt})):mt&&ht?dt?(ht.exports=bt)._=bt:mt._=bt:yt._=bt}).call(this); \ No newline at end of file diff --git a/dist/lodash.js b/dist/lodash.js index 5086ab5d8..59cff105f 100644 --- a/dist/lodash.js +++ b/dist/lodash.js @@ -1691,7 +1691,7 @@ * @param {Array} [partialRightArgs] An array of arguments to append to those * provided to the new function. * @param {Array} [partialHolders] An array of `partialArgs` placeholder indexes. - * @param {Array} [partialRightArgs] An array of `partialRightArgs` placeholder indexes. + * @param {Array} [partialRightHolders] An array of `partialRightArgs` placeholder indexes. * @returns {Function} Returns the new function. */ function createWrapper(func, bitmask, arity, thisArg, partialArgs, partialRightArgs, partialHolders, partialRightHolders) { @@ -1763,10 +1763,10 @@ arity = 0; } if (isPartial) { - partialHolders = getHolders(partialArgs); + partialHolders = []; } if (isPartialRight) { - partialRightHolders = getHolders(partialRightArgs); + partialRightHolders = []; } // fast path for `_.bind` data = [func, bitmask, arity, thisArg, partialArgs, partialRightArgs, partialHolders, partialRightHolders]; @@ -1775,26 +1775,6 @@ : baseCreateWrapper(data); } - /** - * Finds the indexes of all placeholder elements in a given array. - * - * @private - * @param {Array} array The array to inspect. - * @returns {Array} Returns a 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 method returns the custom method, otherwise it returns diff --git a/dist/lodash.min.js b/dist/lodash.min.js index f8e2d1a07..9ce8698bd 100644 --- a/dist/lodash.min.js +++ b/dist/lodash.min.js @@ -5,58 +5,57 @@ */ ;(function(){function n(n,t){if(n!==t){if(n>t||typeof n=="undefined")return 1;if(ne||13e||8202r||13r||8202=A&&(o=r,e=fe(e));++uo(e,f)&&a.push(f)}return a}function ht(n,t){var r=-1,e=n?n.length:0;if(typeof e=="number")for(;++r=A,l=[];if(f)var s=fe(),i=r;else s=u?c():l;for(;++oi(s,h))&&((u||f)&&s.push(h),l.push(g)) -}return!f&&u&&p(s),l}function xt(n,t,r){for(var e=-1,u=t.length,o=-1,i=n.length,a=Qr(r.length-u,0),f=yr(a+i);++or&&(r=0),c&&(i=At(u)),p&&(a=At(o)),s=[n,t,r,e,u,o,i,a],t==w||t==(w|C)?S(s):pt(s))}function At(n){for(var t=-1,r=n.length,e=[];++te?Qr(0,u+e):e||0;else if(e)return e=Bt(n,r),u&&n[e]===r?e:-1;return t(n,r,e)}function Ft(n,t,r){if(typeof t!="number"&&null!=t){var e=0,u=-1,o=n?n.length:0;for(t=y.createCallback(t,r,3);++ut?t=Qr(u+t,0):t>u&&(t=u),typeof r=="undefined"?r=u:0>r?r=Qr(u+r,0):r>u&&(r=u),u=r-t||0,r=yr(u);++e>>1,r(n[e])r?0:r);++t=e)return false;if(typeof n=="string"||!ve(n)&&fr(n))return Ur?Ur.call(n,t,r):-1r?Qr(0,e+r):r)||0,-1o&&(o=a) -}else t=null==t&&fr(n)?e:y.createCallback(t,r,3),ht(n,function(n,r,e){r=t(n,r,e),r>u&&(u=r,o=n)});return o}function Gt(n,t,r,e){var u=3>arguments.length;t=y.createCallback(t,e,4);var o=-1,i=n?n.length:0;if(typeof i=="number")for(u&&i&&(r=n[++o]);++oarguments.length;return t=y.createCallback(t,e,4),vt(n,function(n,e,o){r=u?(u=false,n):t(r,n,e,o)}),r}function Qt(n){var t=-1,r=n?n.length:0,e=yr(typeof r=="number"?r:0); -return ht(n,function(n){var r=kt(0,++t);e[t]=e[r],e[r]=n}),e}function Yt(n,t,r){var e;t=y.createCallback(t,r,3),r=-1;var u=n?n.length:0;if(typeof u=="number"){for(;++rarguments.length)return Ot(n,w,null,t);if(n)var r=n[N]?n[N][2]:n.length,e=$t(arguments,2),r=r-e.length;return Ot(n,w|C,r,t,e)}function nr(n,t,r){function e(){c&&Fr(c),i=c=p=_,(h||g!==t)&&(s=we(),a=n.apply(l,o),c||i||(o=l=null)) -}function u(){var r=t-(we()-f);0>=r||r>t?(i&&Fr(i),r=p,i=c=p=_,r&&(s=we(),a=n.apply(l,o),c||i||(o=l=null))):c=Lr(u,r)}var o,i,a,f,l,c,p,s=0,g=false,h=true;if(!or(n))throw new Cr;if(t=Qr(0,t)||0,true===r)var v=true,h=false;else ir(r)&&(v=r.leading,g="maxWait"in r&&(Qr(t,r.maxWait)||0),h="trailing"in r?r.trailing:h);return function(){if(o=arguments,f=we(),l=this,p=h&&(c||!v),false===g)var r=v&&!c;else{i||v||(s=f);var y=g-(f-s),m=0>=y||y>g;m?(i&&(i=Fr(i)),s=f,a=n.apply(l,o)):i||(i=Lr(e,y))}return m&&c?c=Fr(c):c||t===g||(c=Lr(u,t)),r&&(m=true,a=n.apply(l,o)),!m||c||i||(o=l=null),a -}}function tr(n,t,r){var e=arguments,u=0,o=e.length,i=typeof r;if("number"!=i&&"string"!=i||!e[3]||e[3][r]!==t||(o=2),3--n?t.apply(this,arguments):void 0}},y.assign=tr,y.at=function(n,t){var r=arguments,e=-1,u=mt(r,true,false,1),o=u.length,i=typeof t;for("number"!=i&&"string"!=i||!r[2]||r[2][t]!==n||(o=1),r=yr(o);++earguments.length?Ot(t,w|k,null,n):Ot(t,w|k|C,null,n,$t(arguments,2))},y.chain=function(n){return n=new m(n),n.__chain__=true,n},y.compact=function(n){for(var t=-1,r=n?n.length:0,e=0,u=[];++t=A&&fe(e?n[e]:f)))}var a=n[0],s=-1,g=a?a.length:0,h=[]; -n:for(;++s(v?r(v,l):i(f,l))){for(e=u,(v||f).push(l);--e;)if(v=o[e],0>(v?r(v,l):i(n[e],l)))continue n;h.push(l)}}return p(o),p(f),h},y.invert=function(n,t){for(var r=-1,e=me(n),u=e.length,o={};++rarguments.length&&typeof u=="number")for(;++rr?Qr(0,e+r):Yr(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},y.mixin=gr,y.noConflict=function(){return n._=Nr,this},y.noop=hr,y.now=we,y.parseInt=ke,y.random=function(n,t,r){var e=null==n,u=null==t;return null==r&&(u&&typeof n=="boolean"?(r=n,n=1):typeof t=="boolean"&&(r=t,u=true)),e&&u&&(t=1,u=false),n=+n||0,u?(t=n,n=0):t=+t||0,r||n%1||t%1?(r=te(),Yr(n+r*(t-n+parseFloat("1e-"+((r+"").length-1))),t)):kt(n,t) -},y.reduce=Gt,y.reduceRight=Jt,y.result=function(n,t,r){var e=null==n?_:n[t];return typeof e=="undefined"?r:or(e)?n[t]():e},y.runInContext=b,y.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:me(n).length},y.some=Yt,y.sortedIndex=Bt,y.template=function(n,t,r){var e=y.templateSettings;n=xr(n||""),r=rr({},r,e);var u,o=rr({},r.imports,e.imports),e=me(o),o=lr(o),i=0,a=r.interpolate||M,f="__p+='",a=jr((r.escape||M).source+"|"+a.source+"|"+(a===W?z:M).source+"|"+(r.evaluate||M).source+"|$","g"); -n.replace(a,function(t,r,e,o,a,c){return e||(e=o),f+=n.slice(i,c).replace(V,l),r&&(f+="'+__e("+r+")+'"),a&&(u=true,f+="';"+a+";\n__p+='"),e&&(f+="'+((__t=("+e+"))==null?'':__t)+'"),i=c+t.length,t}),f+="';",a=r=r.variable,a||(r="obj",f="with("+r+"){"+f+"}"),f=(u?f.replace(I,""):f).replace(T,"$1").replace(F,"$1;"),f="function("+r+"){"+(a?"":r+"||("+r+"={});")+"var __t,__p='',__e=_.escape"+(u?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+f+"return __p}";try{var c=br(e,"return "+f).apply(_,o) -}catch(p){throw p.source=f,p}return t?c(t):(c.source=f,c)},y.trim=de,y.trimLeft=be,y.trimRight=_e,y.unescape=function(n){return null==n?"":(n=xr(n),0>n.indexOf(";")?n:n.replace($,d))},y.uniqueId=function(n){var t=++R;return xr(null==n?"":n)+t},y.all=Pt,y.any=Yt,y.detect=Mt,y.findWhere=Mt,y.foldl=Gt,y.foldr=Jt,y.include=Lt,y.inject=Gt,gr(function(){var n={};return dt(y,function(t,r){y.prototype[r]||(n[r]=t)}),n}(),false),y.first=It,y.last=function(n,t,r){var e=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=u; -for(t=y.createCallback(t,r,3);o--&&t(n[o],o,n);)e++}else if(e=t,null==e||r)return n?n[u-1]:_;return e=u-e,$t(n,0e||13e||8202r||13r||8202=A&&(o=r,e=ae(e));++uo(e,f)&&a.push(f)}return a}function ht(n,t){var r=-1,e=n?n.length:0;if(typeof e=="number")for(;++r=A,l=[];if(f)var s=ae(),i=r;else s=u?c():l;for(;++oi(s,h))&&((u||f)&&s.push(h),l.push(g)) +}return!f&&u&&p(s),l}function xt(n,t,r){for(var e=-1,u=t.length,o=-1,i=n.length,a=Jr(r.length-u,0),f=vr(a+i);++or&&(r=0),c&&(i=[]),p&&(a=[]),s=[n,t,r,e,u,o,i,a],t==w||t==(w|C)?S(s):pt(s))}function At(){var n=(n=y.indexOf)===It?t:n;return n}function St(n){return typeof n=="function"&&Rr.test($r.call(n))}function Et(n){var t,r;return n&&Nr.call(n)==et&&(Dr.call(n,"constructor")||(t=n.constructor,!ur(t)||t instanceof t))?(o(n,function(n,t){r=t +}),typeof r=="undefined"||Dr.call(n,r)):false}function Nt(n){return n&&typeof n=="object"&&typeof n.length=="number"&&Nr.call(n)==Q||false}function Rt(n,t,r){var e=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=-1;for(t=y.createCallback(t,r,3);++oe?Jr(0,u+e):e||0;else if(e)return e=$t(n,r),u&&n[e]===r?e:-1;return t(n,r,e)}function Tt(n,t,r){if(typeof t!="number"&&null!=t){var e=0,u=-1,o=n?n.length:0; +for(t=y.createCallback(t,r,3);++ut?t=Jr(u+t,0):t>u&&(t=u),typeof r=="undefined"?r=u:0>r?r=Jr(u+r,0):r>u&&(r=u),u=r-t||0,r=vr(u);++e>>1,r(n[e])r?0:r);++t=e)return false;if(typeof n=="string"||!he(n)&&ar(n))return Mr?Mr.call(n,t,r):-1r?Jr(0,e+r):r)||0,-1o&&(o=a)}else t=null==t&&ar(n)?e:y.createCallback(t,r,3),ht(n,function(n,r,e){r=t(n,r,e),r>u&&(u=r,o=n)});return o}function Xt(n,t,r,e){var u=3>arguments.length; +t=y.createCallback(t,e,4);var o=-1,i=n?n.length:0;if(typeof i=="number")for(u&&i&&(r=n[++o]);++oarguments.length;return t=y.createCallback(t,e,4),vt(n,function(n,e,o){r=u?(u=false,n):t(r,n,e,o)}),r}function Jt(n){var t=-1,r=n?n.length:0,e=vr(typeof r=="number"?r:0);return ht(n,function(n){var r=kt(0,++t);e[t]=e[r],e[r]=n}),e}function Qt(n,t,r){var e;t=y.createCallback(t,r,3),r=-1;var u=n?n.length:0; +if(typeof u=="number"){for(;++rarguments.length)return Ot(n,w,null,t);if(n)var r=n[N]?n[N][2]:n.length,e=Ft(arguments,2),r=r-e.length;return Ot(n,w|C,r,t,e)}function Zt(n,t,r){function e(){c&&Tr(c),i=c=p=_,(h||g!==t)&&(s=_e(),a=n.apply(l,o),c||i||(o=l=null))}function u(){var r=t-(_e()-f);0>=r||r>t?(i&&Tr(i),r=p,i=c=p=_,r&&(s=_e(),a=n.apply(l,o),c||i||(o=l=null))):c=zr(u,r)}var o,i,a,f,l,c,p,s=0,g=false,h=true; +if(!ur(n))throw new xr;if(t=Jr(0,t)||0,true===r)var v=true,h=false;else or(r)&&(v=r.leading,g="maxWait"in r&&(Jr(t,r.maxWait)||0),h="trailing"in r?r.trailing:h);return function(){if(o=arguments,f=_e(),l=this,p=h&&(c||!v),false===g)var r=v&&!c;else{i||v||(s=f);var y=g-(f-s),m=0>=y||y>g;m?(i&&(i=Tr(i)),s=f,a=n.apply(l,o)):i||(i=zr(e,y))}return m&&c?c=Tr(c):c||t===g||(c=zr(u,t)),r&&(m=true,a=n.apply(l,o)),!m||c||i||(o=l=null),a}}function nr(n,t,r){var e=arguments,u=0,o=e.length,i=typeof r;if("number"!=i&&"string"!=i||!e[3]||e[3][r]!==t||(o=2),3--n?t.apply(this,arguments):void 0}},y.assign=nr,y.at=function(n,t){var r=arguments,e=-1,u=mt(r,true,false,1),o=u.length,i=typeof t;for("number"!=i&&"string"!=i||!r[2]||r[2][t]!==n||(o=1),r=vr(o);++earguments.length?Ot(t,w|k,null,n):Ot(t,w|k|C,null,n,Ft(arguments,2))},y.chain=function(n){return n=new m(n),n.__chain__=true,n},y.compact=function(n){for(var t=-1,r=n?n.length:0,e=0,u=[];++t=A&&ae(e?n[e]:f)))}var a=n[0],s=-1,g=a?a.length:0,h=[]; +n:for(;++s(v?r(v,l):i(f,l))){for(e=u,(v||f).push(l);--e;)if(v=o[e],0>(v?r(v,l):i(n[e],l)))continue n;h.push(l)}}return p(o),p(f),h},y.invert=function(n,t){for(var r=-1,e=ye(n),u=e.length,o={};++rarguments.length&&typeof u=="number")for(;++rr?Jr(0,e+r):Qr(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},y.mixin=sr,y.noConflict=function(){return n._=Er,this},y.noop=gr,y.now=_e,y.parseInt=we,y.random=function(n,t,r){var e=null==n,u=null==t;return null==r&&(u&&typeof n=="boolean"?(r=n,n=1):typeof t=="boolean"&&(r=t,u=true)),e&&u&&(t=1,u=false),n=+n||0,u?(t=n,n=0):t=+t||0,r||n%1||t%1?(r=ne(),Qr(n+r*(t-n+parseFloat("1e-"+((r+"").length-1))),t)):kt(n,t) +},y.reduce=Xt,y.reduceRight=Gt,y.result=function(n,t,r){var e=null==n?_:n[t];return typeof e=="undefined"?r:ur(e)?n[t]():e},y.runInContext=b,y.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:ye(n).length},y.some=Qt,y.sortedIndex=$t,y.template=function(n,t,r){var e=y.templateSettings;n=jr(n||""),r=tr({},r,e);var u,o=tr({},r.imports,e.imports),e=ye(o),o=fr(o),i=0,a=r.interpolate||M,f="__p+='",a=kr((r.escape||M).source+"|"+a.source+"|"+(a===W?z:M).source+"|"+(r.evaluate||M).source+"|$","g"); +n.replace(a,function(t,r,e,o,a,c){return e||(e=o),f+=n.slice(i,c).replace(V,l),r&&(f+="'+__e("+r+")+'"),a&&(u=true,f+="';"+a+";\n__p+='"),e&&(f+="'+((__t=("+e+"))==null?'':__t)+'"),i=c+t.length,t}),f+="';",a=r=r.variable,a||(r="obj",f="with("+r+"){"+f+"}"),f=(u?f.replace(I,""):f).replace(T,"$1").replace(F,"$1;"),f="function("+r+"){"+(a?"":r+"||("+r+"={});")+"var __t,__p='',__e=_.escape"+(u?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+f+"return __p}";try{var c=dr(e,"return "+f).apply(_,o) +}catch(p){throw p.source=f,p}return t?c(t):(c.source=f,c)},y.trim=me,y.trimLeft=de,y.trimRight=be,y.unescape=function(n){return null==n?"":(n=jr(n),0>n.indexOf(";")?n:n.replace($,d))},y.uniqueId=function(n){var t=++R;return jr(null==n?"":n)+t},y.all=Lt,y.any=Qt,y.detect=Kt,y.findWhere=Kt,y.foldl=Xt,y.foldr=Gt,y.include=zt,y.inject=Xt,sr(function(){var n={};return dt(y,function(t,r){y.prototype[r]||(n[r]=t)}),n}(),false),y.first=Rt,y.last=function(n,t,r){var e=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=u; +for(t=y.createCallback(t,r,3);o--&&t(n[o],o,n);)e++}else if(e=t,null==e||r)return n?n[u-1]:_;return e=u-e,Ft(n,0"']/g,D=/<%-([\s\S]+?)%>/g,q=/<%([\s\S]+?)%>/g,W=/<%=([\s\S]+?)%>/g,z=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,L=/\w*$/,P=/^\s*function[ \n\r\t]+\w/,K=/^0[xX]/,M=/($^)/,U=/\bthis\b/,V=/['\n\r\t\u2028\u2029\\]/g,H=" \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=[],G=[],J="Array Boolean Date Function Math Number Object RegExp Set String _ clearTimeout document isFinite isNaN parseInt setTimeout TypeError window WinRTError".split(" "),Q="[object Arguments]",Y="[object Array]",Z="[object Boolean]",nt="[object Date]",tt="[object Function]",rt="[object Number]",et="[object Object]",ut="[object RegExp]",ot="[object String]",it={}; it[tt]=false,it[Q]=it[Y]=it[Z]=it[nt]=it[rt]=it[et]=it[ut]=it[ot]=true;var at={leading:false,maxWait:0,trailing:false},ft={configurable:false,enumerable:false,value:null,writable:false},lt={"&":"&","<":"<",">":">",'"':""","'":"'"},ct={"&":"&","<":"<",">":">",""":'"',"'":"'"},pt={"function":true,object:true},st={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},gt=pt[typeof window]&&window||this,ht=pt[typeof exports]&&exports&&!exports.nodeType&&exports,pt=pt[typeof module]&&module&&!module.nodeType&&module,vt=ht&&pt&&typeof global=="object"&&global; !vt||vt.global!==vt&&vt.window!==vt&&vt.self!==vt||(gt=vt);var vt=pt&&pt.exports===ht&&ht,yt=b();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(gt._=yt, define(function(){return yt})):ht&&pt?vt?(pt.exports=yt)._=yt:ht._=yt:gt._=yt}).call(this); \ No newline at end of file diff --git a/lodash.js b/lodash.js index 83366cfdc..12b04bbb3 100644 --- a/lodash.js +++ b/lodash.js @@ -1933,7 +1933,7 @@ * @param {Array} [partialRightArgs] An array of arguments to append to those * provided to the new function. * @param {Array} [partialHolders] An array of `partialArgs` placeholder indexes. - * @param {Array} [partialRightArgs] An array of `partialRightArgs` placeholder indexes. + * @param {Array} [partialRightHolders] An array of `partialRightArgs` placeholder indexes. * @returns {Function} Returns the new function. */ function createWrapper(func, bitmask, arity, thisArg, partialArgs, partialRightArgs, partialHolders, partialRightHolders) {