diff --git a/dist/lodash.underscore.js b/dist/lodash.underscore.js index 942242a41..3f1a25032 100644 --- a/dist/lodash.underscore.js +++ b/dist/lodash.underscore.js @@ -950,18 +950,13 @@ isPartial = bitmask & PARTIAL_FLAG, isPartialRight = bitmask & PARTIAL_RIGHT_FLAG; - if (!isBindKey && !isFunction(func)) { + if (!isFunction(func)) { throw new TypeError; } if (isPartial && !partialArgs.length) { bitmask &= ~PARTIAL_FLAG; isPartial = partialArgs = false; } - if (arity == null) { - arity = isBindKey ? 0 : func.length; - } else if (arity < 0) { - arity = 0; - } if (isPartial) { partialHolders = getHolders(partialArgs); } diff --git a/dist/lodash.underscore.min.js b/dist/lodash.underscore.min.js index 94b51373b..aa8ed2220 100644 --- a/dist/lodash.underscore.min.js +++ b/dist/lodash.underscore.min.js @@ -3,37 +3,37 @@ * Lo-Dash 2.4.1 (Custom Build) lodash.com/license | Underscore.js 1.6.0 underscorejs.org/LICENSE * Build: `lodash underscore -o ./dist/lodash.underscore.js` */ -;(function(){function n(n){var r=[];if(!H(n))return r;for(var t in n)Ir.call(n,t)&&r.push(t);return r}function r(n,r){if(H(n))for(var t in n)if(r(n[t],t,n)===or)break}function t(n,r,t){t=(t||0)-1;for(var e=n?n.length:0;++te||typeof t=="undefined"){t=1;break n}if(tu(r,i)&&o.push(i)}return o}function g(n,r){var t=-1,e=n?n.length:0;if(typeof e=="number")for(;++to(f,c)&&(t&&f.push(c),i.push(a)) -}return i}function _(n,r){return function(t,e,u){var o=r?[[],[]]:{};e=Q(e,u,3),u=-1;var i=t?t.length:0;if(typeof i=="number")for(;++uo&&(o=0),a){u=e;for(var i=-1,a=u.length,c=[];++ie?Gr(0,u+e):e||0;else if(e)return e=O(n,r),u&&n[e]===r?e:-1;return t(n,r,e)}function T(n,r,t){return E(n,null==r||t?1:0r?r=Gr(u+r,0):r>u&&(r=u),typeof t=="undefined"?t=u:0>t?t=Gr(u+t,0):t>u&&(t=u),u=t-r||0,t=Array(u);++e>>1,t(n[e])e||typeof t=="undefined"){t=1;break n}if(tu(r,i)&&o.push(i)}return o}function g(n,r){var t=-1,e=n?n.length:0;if(typeof e=="number")for(;++to(f,c)&&(t&&f.push(c),i.push(a)) +}return i}function _(n,r){return function(t,e,u){var o=r?[[],[]]:{};e=Q(e,u,3),u=-1;var i=t?t.length:0;if(typeof i=="number")for(;++ue?Vr(0,u+e):e||0;else if(e)return e=O(n,r),u&&n[e]===r?e:-1;return t(n,r,e)}function T(n,r,t){return E(n,null==r||t?1:0r?r=Vr(u+r,0):r>u&&(r=u),typeof t=="undefined"?t=u:0>t?t=Vr(u+t,0):t>u&&(t=u),u=t-r||0,t=Array(u);++e>>1,t(n[e])u&&(u=t);else r=Q(r,t,3),g(n,function(n,t,o){t=r(n,t,o),t>e&&(e=t,u=n)});return u}function I(n,r,t,e){var u=3>arguments.length;r=Q(r,e,4);var o=-1,i=n?n.length:0; -if(typeof i=="number")for(u&&i&&(t=n[++o]);++oarguments.length;return r=Q(r,e,4),h(n,function(n,e,o){t=u?(u=false,n):r(t,n,e,o)}),t}function D(n){var r=-1,t=n?n.length:0,e=Array(typeof t=="number"?t:0);return g(n,function(n){var t;t=++r,t=0+Rr(Kr()*(t-0+1)),e[r]=e[t],e[t]=n}),e}function W(n,r,t){var e;r=Q(r,t,3),t=-1;var u=n?n.length:0;if(typeof u=="number"){for(;++targuments.length?b(n,tr,r):b(n,tr|ur,r,E(arguments,2))}function C(n,r,t){function e(){l&&clearTimeout(l),i=l=p=rr,(h||g!==r)&&(s=ut(),f=n.apply(c,o),l||i||(o=c=null))}function u(){var t=r-(ut()-a);0>=t||t>r?(i&&clearTimeout(i),t=p,i=l=p=rr,t&&(s=ut(),f=n.apply(c,o),l||i||(o=c=null))):l=setTimeout(u,t)}var o,i,f,a,c,l,p,s=0,g=false,h=true;if(!G(n))throw new TypeError;if(r=Gr(0,r)||0,true===t)var v=true,h=false;else H(t)&&(v=t.leading,g="maxWait"in t&&(Gr(r,t.maxWait)||0),h="trailing"in t?t.trailing:h); -return function(){if(o=arguments,a=ut(),c=this,p=h&&(l||!v),false===g)var t=v&&!l;else{i||v||(s=a);var y=g-(a-s),m=0>=y||y>g;m?(i&&(i=clearTimeout(i)),s=a,f=n.apply(c,o)):i||(i=setTimeout(e,y))}return m&&l?l=clearTimeout(l):l||r===g||(l=setTimeout(u,r)),t&&(m=true,f=n.apply(c,o)),!m||l||i||(o=c=null),f}}function P(n,r,t){if(!n)return n;var e=arguments,u=0,o=e.length,i=typeof t;for("number"!=i&&"string"!=i||!e[3]||e[3][t]!==r||(o=2);++u"']/g,cr=/($^)/,lr=/['\n\r\t\u2028\u2029\\]/g,pr="[object Arguments]",sr="[object Array]",gr="[object Boolean]",hr="[object Date]",vr="[object Number]",yr="[object Object]",mr="[object RegExp]",_r="[object String]",br={"&":"&","<":"<",">":">",'"':""","'":"'"},dr={"&":"&","<":"<",">":">",""":'"',"'":"'"},wr={"function":true,object:true},jr={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},xr=wr[typeof window]&&window||this,Ar=wr[typeof exports]&&exports&&!exports.nodeType&&exports,Tr=wr[typeof module]&&module&&!module.nodeType&&module,Er=Ar&&Tr&&typeof global=="object"&&global; -!Er||Er.global!==Er&&Er.window!==Er&&Er.self!==Er||(xr=Er);var Or=Tr&&Tr.exports===Ar&&Ar,kr=Array.prototype,Sr=Object.prototype,Nr=xr._,qr=Sr.toString,Fr=RegExp("^"+(qr+"").replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),Br=Math.ceil,Rr=Math.floor,$r=Function.prototype.toString,Ir=Sr.hasOwnProperty,Mr=kr.push,Dr=Sr.propertyIsEnumerable,Wr=kr.splice,zr=w(zr=Object.create)&&zr,Cr=w(Cr=Array.isArray)&&Cr,Pr=xr.isFinite,Ur=xr.isNaN,Vr=w(Vr=Object.keys)&&Vr,Gr=Math.max,Hr=Math.min,Jr=w(Jr=Date.now)&&Jr,Kr=Math.random; -a.prototype=f.prototype;var Lr={};!function(){var n={0:1,length:1};Lr.spliceObjects=(Wr.call(n,0,1),!n[0])}(1),f.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},zr||(c=function(){function n(){}return function(r){if(H(r)){n.prototype=r;var t=new n;n.prototype=null}return t||xr.Object()}}()),j(arguments)||(j=function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&Ir.call(n,"callee")&&!Dr.call(n,"callee")||false});var Qr=_(function(n,r,t){Ir.call(n,t)?n[t]++:n[t]=1 -}),Xr=_(function(n,r,t){Ir.call(n,t)?n[t].push(r):n[t]=[r]}),Yr=_(function(n,r,t){n[t]=r}),Zr=_(function(n,r,t){n[t?0:1].push(r)},true),nt=R,rt=q,tt=Cr||function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&qr.call(n)==sr||false};G(/x/)&&(G=function(n){return typeof n=="function"&&"[object Function]"==qr.call(n)});var et=Vr?function(n){return H(n)?Vr(n):[]}:n,ut=Jr||function(){return(new Date).getTime()};f.after=function(n,r){if(!G(r))throw new TypeError;return function(){return 1>--n?r.apply(this,arguments):void 0 +if(typeof i=="number")for(u&&i&&(t=n[++o]);++oarguments.length;return r=Q(r,e,4),h(n,function(n,e,o){t=u?(u=false,n):r(t,n,e,o)}),t}function D(n){var r=-1,t=n?n.length:0,e=Array(typeof t=="number"?t:0);return g(n,function(n){var t;t=++r,t=0+Br(Jr()*(t-0+1)),e[r]=e[t],e[t]=n}),e}function W(n,r,t){var e;r=Q(r,t,3),t=-1;var u=n?n.length:0;if(typeof u=="number"){for(;++targuments.length?b(n,tr,r):b(n,tr|er,r,E(arguments,2))}function C(n,r,t){function e(){l&&clearTimeout(l),i=l=p=rr,(h||g!==r)&&(s=et(),f=n.apply(c,o),l||i||(o=c=null))}function u(){var t=r-(et()-a);0>=t||t>r?(i&&clearTimeout(i),t=p,i=l=p=rr,t&&(s=et(),f=n.apply(c,o),l||i||(o=c=null))):l=setTimeout(u,t)}var o,i,f,a,c,l,p,s=0,g=false,h=true;if(!G(n))throw new TypeError;if(r=Vr(0,r)||0,true===t)var v=true,h=false;else H(t)&&(v=t.leading,g="maxWait"in t&&(Vr(r,t.maxWait)||0),h="trailing"in t?t.trailing:h); +return function(){if(o=arguments,a=et(),c=this,p=h&&(l||!v),false===g)var t=v&&!l;else{i||v||(s=a);var y=g-(a-s),m=0>=y||y>g;m?(i&&(i=clearTimeout(i)),s=a,f=n.apply(c,o)):i||(i=setTimeout(e,y))}return m&&l?l=clearTimeout(l):l||r===g||(l=setTimeout(u,r)),t&&(m=true,f=n.apply(c,o)),!m||l||i||(o=c=null),f}}function P(n,r,t){if(!n)return n;var e=arguments,u=0,o=e.length,i=typeof t;for("number"!=i&&"string"!=i||!e[3]||e[3][t]!==r||(o=2);++u"']/g,ar=/($^)/,cr=/['\n\r\t\u2028\u2029\\]/g,lr="[object Arguments]",pr="[object Array]",sr="[object Boolean]",gr="[object Date]",hr="[object Number]",vr="[object Object]",yr="[object RegExp]",mr="[object String]",_r={"&":"&","<":"<",">":">",'"':""","'":"'"},br={"&":"&","<":"<",">":">",""":'"',"'":"'"},dr={"function":true,object:true},wr={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},jr=dr[typeof window]&&window||this,xr=dr[typeof exports]&&exports&&!exports.nodeType&&exports,Ar=dr[typeof module]&&module&&!module.nodeType&&module,Tr=xr&&Ar&&typeof global=="object"&&global; +!Tr||Tr.global!==Tr&&Tr.window!==Tr&&Tr.self!==Tr||(jr=Tr);var Er=Ar&&Ar.exports===xr&&xr,Or=Array.prototype,kr=Object.prototype,Sr=jr._,Nr=kr.toString,qr=RegExp("^"+(Nr+"").replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),Fr=Math.ceil,Br=Math.floor,Rr=Function.prototype.toString,$r=kr.hasOwnProperty,Ir=Or.push,Mr=kr.propertyIsEnumerable,Dr=Or.splice,Wr=w(Wr=Object.create)&&Wr,zr=w(zr=Array.isArray)&&zr,Cr=jr.isFinite,Pr=jr.isNaN,Ur=w(Ur=Object.keys)&&Ur,Vr=Math.max,Gr=Math.min,Hr=w(Hr=Date.now)&&Hr,Jr=Math.random; +a.prototype=f.prototype;var Kr={};!function(){var n={0:1,length:1};Kr.spliceObjects=(Dr.call(n,0,1),!n[0])}(1),f.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},Wr||(c=function(){function n(){}return function(r){if(H(r)){n.prototype=r;var t=new n;n.prototype=null}return t||jr.Object()}}()),j(arguments)||(j=function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&$r.call(n,"callee")&&!Mr.call(n,"callee")||false});var Lr=_(function(n,r,t){$r.call(n,t)?n[t]++:n[t]=1 +}),Qr=_(function(n,r,t){$r.call(n,t)?n[t].push(r):n[t]=[r]}),Xr=_(function(n,r,t){n[t]=r}),Yr=_(function(n,r,t){n[t?0:1].push(r)},true),Zr=R,nt=q,rt=zr||function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&Nr.call(n)==pr||false};G(/x/)&&(G=function(n){return typeof n=="function"&&"[object Function]"==Nr.call(n)});var tt=Ur?function(n){return H(n)?Ur(n):[]}:n,et=Hr||function(){return(new Date).getTime()};f.after=function(n,r){if(!G(r))throw new TypeError;return function(){return 1>--n?r.apply(this,arguments):void 0 }},f.bind=z,f.bindAll=function(n){for(var r=1i(a,e)){for(r=t;--r;)if(0>i(n[r],e))continue n;a.push(e)}return a},f.invert=function(n){for(var r=-1,t=et(n),e=t.length,u={};++rr?0:r);++nt?Gr(0,e+t):Hr(t,e-1))+1);e--;)if(n[e]===r)return e;return-1},f.mixin=Z,f.noConflict=function(){return xr._=Nr,this},f.now=ut,f.random=function(n,r){return null==n&&null==r&&(r=1),n=+n||0,null==r?(r=n,n=0):r=+r||0,n+Rr(Kr()*(r-n+1)) -},f.reduce=I,f.reduceRight=M,f.result=function(n,r){if(null!=n){var t=n[r];return G(t)?n[r]():t}},f.size=function(n){var r=n?n.length:0;return typeof r=="number"?r:et(n).length},f.some=W,f.sortedIndex=O,f.template=function(n,r,t){var e=f,u=e.templateSettings;n=(n||"")+"",t=U({},t,u);var i=0,a="__p+='",u=t.variable;n.replace(RegExp((t.escape||cr).source+"|"+(t.interpolate||cr).source+"|"+(t.evaluate||cr).source+"|$","g"),function(r,t,e,u,f){return a+=n.slice(i,f).replace(lr,o),t&&(a+="'+_.escape("+t+")+'"),u&&(a+="';"+u+";\n__p+='"),e&&(a+="'+((__t=("+e+"))==null?'':__t)+'"),i=f+r.length,r -}),a+="';",u||(a="with(obj||{}){"+a+"}"),a="function("+(u||"obj")+"){var __t,__p='',__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}"+a+"return __p}";try{var c=Function("_","return "+a)(e)}catch(l){throw l.source=a,l}return r?c(r):(c.source=a,c)},f.unescape=function(n){return null==n?"":(n+="",0>n.indexOf(";")?n:n.replace(fr,i))},f.uniqueId=function(n){var r=++ir+"";return n?n+r:r},f.all=N,f.any=W,f.detect=F,f.findWhere=F,f.foldl=I,f.foldr=M,f.include=S,f.inject=I,f.first=x,f.last=function(n,r,t){var e=n?n.length:0; -return null==r||t?n?n[e-1]:rr:(r=e-r,E(n,0i(a,e)){for(r=t;--r;)if(0>i(n[r],e))continue n;a.push(e)}return a},f.invert=function(n){for(var r=-1,t=tt(n),e=t.length,u={};++rr?0:r);++nt?Vr(0,e+t):Gr(t,e-1))+1);e--;)if(n[e]===r)return e;return-1},f.mixin=Z,f.noConflict=function(){return jr._=Sr,this},f.now=et,f.random=function(n,r){return null==n&&null==r&&(r=1),n=+n||0,null==r?(r=n,n=0):r=+r||0,n+Br(Jr()*(r-n+1)) +},f.reduce=I,f.reduceRight=M,f.result=function(n,r){if(null!=n){var t=n[r];return G(t)?n[r]():t}},f.size=function(n){var r=n?n.length:0;return typeof r=="number"?r:tt(n).length},f.some=W,f.sortedIndex=O,f.template=function(n,r,t){var e=f,u=e.templateSettings;n=(n||"")+"",t=U({},t,u);var i=0,a="__p+='",u=t.variable;n.replace(RegExp((t.escape||ar).source+"|"+(t.interpolate||ar).source+"|"+(t.evaluate||ar).source+"|$","g"),function(r,t,e,u,f){return a+=n.slice(i,f).replace(cr,o),t&&(a+="'+_.escape("+t+")+'"),u&&(a+="';"+u+";\n__p+='"),e&&(a+="'+((__t=("+e+"))==null?'':__t)+'"),i=f+r.length,r +}),a+="';",u||(a="with(obj||{}){"+a+"}"),a="function("+(u||"obj")+"){var __t,__p='',__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}"+a+"return __p}";try{var c=Function("_","return "+a)(e)}catch(l){throw l.source=a,l}return r?c(r):(c.source=a,c)},f.unescape=function(n){return null==n?"":(n+="",0>n.indexOf(";")?n:n.replace(ir,i))},f.uniqueId=function(n){var r=++or+"";return n?n+r:r},f.all=N,f.any=W,f.detect=F,f.findWhere=F,f.foldl=I,f.foldr=M,f.include=S,f.inject=I,f.first=x,f.last=function(n,r,t){var e=n?n.length:0; +return null==r||t?n?n[e-1]:rr:(r=e-r,E(n,0