diff --git a/dist/lodash.compat.js b/dist/lodash.compat.js index 50eec4028..a7438d626 100644 --- a/dist/lodash.compat.js +++ b/dist/lodash.compat.js @@ -500,7 +500,7 @@ var reNative = RegExp('^' + String(toString) .replace(/[.*+?^${}()|[\]\\]/g, '\\$&') - .replace(/\b(function)\b.*?(?=\\\()| for .+?(?=\\\])|\btoString\b/g, '$1.*?') + '$' + .replace(/toString|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$' ); /** Native method shortcuts */ diff --git a/dist/lodash.compat.min.js b/dist/lodash.compat.min.js index e7f6422f4..8688e835f 100644 --- a/dist/lodash.compat.min.js +++ b/dist/lodash.compat.min.js @@ -28,7 +28,7 @@ for(var u=n.length;++r>>1,r(n[e])r?0:r);++t=h;m?(u&&(u=jr(u)),c=a,o=n.apply(i,e)):u||(u=Ir(y,h))}return m&&f?f=jr(f):f||t===p||(f=Ir(v,t)),r&&(m=true,o=n.apply(i,e)),!m||f||u||(e=i=null),o}}function Yt(n){return n}function Zt(n,t,r){var e=true,u=t&&xt(t);t&&(r||u.length)||(null==r&&(r=t),o=y,t=n,n=v,u=xt(t)),false===r?e=false:Et(r)&&"chain"in r&&(e=r.chain); -var o=n,a=Ot(o);Dt(u,function(r){var u=n[r]=t[r];a&&(o.prototype[r]=function(){var t=this.__chain__,r=this.__wrapped__,a=[r];if(Er.apply(a,arguments),a=u.apply(n,a),e||t){if(r===a&&Et(a))return this;a=new o(a),a.__chain__=t}return a})})}function nr(){}function tr(n){return function(t){return t[n]}}function rr(){return this.__wrapped__}r=r?et.defaults(Y.Object(),r,et.pick(Y,D)):Y;var er=r.Array,ur=r.Boolean,or=r.Date,ar=r.Function,ir=r.Math,fr=r.Number,lr=r.Object,cr=r.RegExp,pr=r.String,sr=r.TypeError,gr=[],hr=r.Error.prototype,vr=lr.prototype,yr=pr.prototype,mr=(mr=r.window)&&mr.document,dr=r._,br=vr.toString,_r=cr("^"+pr(br).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/\b(function)\b.*?(?=\\\()| for .+?(?=\\\])|\btoString\b/g,"$1.*?")+"$"),wr=ir.ceil,jr=r.clearTimeout,xr=ir.floor,Cr=ar.prototype.toString,kr=vt(kr=lr.getPrototypeOf)&&kr,Or=vr.hasOwnProperty,Er=gr.push,Sr=vr.propertyIsEnumerable,Ir=r.setTimeout,Ar=gr.splice,Nr=gr.unshift,Rr=function(){try{var n={},t=vt(t=lr.defineProperty)&&t,r=t(n,n,n)&&t +var o=n,a=Ot(o);Dt(u,function(r){var u=n[r]=t[r];a&&(o.prototype[r]=function(){var t=this.__chain__,r=this.__wrapped__,a=[r];if(Er.apply(a,arguments),a=u.apply(n,a),e||t){if(r===a&&Et(a))return this;a=new o(a),a.__chain__=t}return a})})}function nr(){}function tr(n){return function(t){return t[n]}}function rr(){return this.__wrapped__}r=r?et.defaults(Y.Object(),r,et.pick(Y,D)):Y;var er=r.Array,ur=r.Boolean,or=r.Date,ar=r.Function,ir=r.Math,fr=r.Number,lr=r.Object,cr=r.RegExp,pr=r.String,sr=r.TypeError,gr=[],hr=r.Error.prototype,vr=lr.prototype,yr=pr.prototype,mr=(mr=r.window)&&mr.document,dr=r._,br=vr.toString,_r=cr("^"+pr(br).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),wr=ir.ceil,jr=r.clearTimeout,xr=ir.floor,Cr=ar.prototype.toString,kr=vt(kr=lr.getPrototypeOf)&&kr,Or=vr.hasOwnProperty,Er=gr.push,Sr=vr.propertyIsEnumerable,Ir=r.setTimeout,Ar=gr.splice,Nr=gr.unshift,Rr=function(){try{var n={},t=vt(t=lr.defineProperty)&&t,r=t(n,n,n)&&t }catch(e){}return r}(),Tr=vt(Tr=lr.create)&&Tr,Pr=vt(Pr=er.isArray)&&Pr,Dr=r.isFinite,$r=r.isNaN,Fr=vt(Fr=lr.keys)&&Fr,qr=ir.max,Br=ir.min,Lr=r.parseInt,Wr=ir.random,zr={};zr[q]=er,zr[B]=ur,zr[L]=or,zr[z]=ar,zr[M]=lr,zr[K]=fr,zr[V]=cr,zr[U]=pr;var Kr={};Kr[q]=Kr[L]=Kr[K]={constructor:true,toLocaleString:true,toString:true,valueOf:true},Kr[B]=Kr[U]={constructor:true,toString:true,valueOf:true},Kr[W]=Kr[z]=Kr[V]={constructor:true,toString:true},Kr[M]={constructor:true},function(){for(var n=$.length;n--;){var t,r=$[n]; for(t in Kr)Or.call(Kr,t)&&!Or.call(Kr[t],r)&&(Kr[t][r]=false)}}(),y.prototype=v.prototype;var Mr=v.support={};!function(){var n=function(){this.x=1},t={0:1,length:1},e=[];n.prototype={valueOf:1,y:1};for(var u in new n)e.push(u);for(u in arguments);Mr.argsClass=br.call(arguments)==F,Mr.argsObject=arguments.constructor==lr&&!(arguments instanceof er),Mr.enumErrorProps=Sr.call(hr,"message")||Sr.call(hr,"name"),Mr.enumPrototypes=Sr.call(n,"prototype"),Mr.funcDecomp=!vt(r.WinRTError)&&T.test(g),Mr.funcNames=typeof ar.name=="string",Mr.nonEnumArgs=0!=u,Mr.nonEnumShadows=!/valueOf/.test(e),Mr.ownLast="x"!=e[0],Mr.spliceObjects=(gr.splice.call(t,0,1),!t[0]),Mr.unindexedChars="xx"!="x"[0]+lr("x")[0]; try{Mr.dom=11===mr.createDocumentFragment().nodeType}catch(o){Mr.dom=false}try{Mr.nodeClass=!(br.call(undefined)==M&&!({toString:0}+""))}catch(a){Mr.nodeClass=true}}(1),v.templateSettings={escape:S,evaluate:I,interpolate:A,variable:"",imports:{_:v}},Tr||(Z=function(){function n(){}return function(t){if(Et(t)){n.prototype=t;var e=new n;n.prototype=null}return e||r.Object()}}());var Vr=Rr?function(n,t){J.value=t,Rr(n,"__bindData__",J)}:nr;Mr.argsClass||(dt=function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&Or.call(n,"callee")&&!Sr.call(n,"callee")||false diff --git a/dist/lodash.js b/dist/lodash.js index 4afbc85ad..d1a09d184 100644 --- a/dist/lodash.js +++ b/dist/lodash.js @@ -474,7 +474,7 @@ var reNative = RegExp('^' + String(toString) .replace(/[.*+?^${}()|[\]\\]/g, '\\$&') - .replace(/\b(function)\b.*?(?=\\\()| for .+?(?=\\\])|\btoString\b/g, '$1.*?') + '$' + .replace(/toString|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$' ); /** Native method shortcuts */ diff --git a/dist/lodash.min.js b/dist/lodash.min.js index 266c49ca2..4b461a66d 100644 --- a/dist/lodash.min.js +++ b/dist/lodash.min.js @@ -26,7 +26,7 @@ for(var i=n.length;++eo&&(o=a)}}else t=null==t&&Ot(n)?r:d.crea }function Pt(t,e,r){if(typeof r=="number"){var u=t?t.length:0;r=0>r?Te(0,u+r):r||0}else if(r)return r=Lt(t,e),t[r]===e?r:-1;return n(t,e,r)}function Kt(n,t,e){if(typeof t!="number"&&null!=t){var r=0,u=-1,o=n?n.length:0;for(t=d.createCallback(t,e,3);++u>>1,e(n[r])e?0:e);++t=h;m?(i&&(i=me(i)),s=f,a=n.apply(l,o)):i||(i=ke(r,h))}return m&&c?c=me(c):c||t===v||(c=ke(u,t)),e&&(m=true,a=n.apply(l,o)),!m||c||i||(o=l=null),a}}function Jt(n){return n}function Qt(n,t,e){var r=true,u=t&&_t(t); -t&&(e||u.length)||(null==e&&(e=t),o=H,t=n,n=d,u=_t(t)),false===e?r=false:xt(e)&&"chain"in e&&(r=e.chain);var o=n,i=kt(o);Tt(u,function(e){var u=n[e]=t[e];i&&(o.prototype[e]=function(){var t=this.__chain__,e=this.__wrapped__,i=[e];if(je.apply(i,arguments),i=u.apply(n,i),r||t){if(e===i&&xt(i))return this;i=new o(i),i.__chain__=t}return i})})}function Xt(){}function Yt(n){return function(t){return t[n]}}function Zt(){return this.__wrapped__}e=e?nt.defaults(J.Object(),e,nt.pick(J,D)):J;var ne=e.Array,te=e.Boolean,ee=e.Date,re=e.Function,ue=e.Math,oe=e.Number,ie=e.Object,ae=e.RegExp,fe=e.String,le=e.TypeError,ce=[],pe=ie.prototype,se=(se=e.window)&&se.document,he=e._,ve=pe.toString,ge=ae("^"+fe(ve).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/\b(function)\b.*?(?=\\\()| for .+?(?=\\\])|\btoString\b/g,"$1.*?")+"$"),ye=ue.ceil,me=e.clearTimeout,be=ue.floor,de=re.prototype.toString,_e=st(_e=ie.getPrototypeOf)&&_e,we=pe.hasOwnProperty,je=ce.push,ke=e.setTimeout,xe=ce.splice,Ce=ce.unshift,Oe=function(){try{var n={},t=st(t=ie.defineProperty)&&t,e=t(n,n,n)&&t +t&&(e||u.length)||(null==e&&(e=t),o=H,t=n,n=d,u=_t(t)),false===e?r=false:xt(e)&&"chain"in e&&(r=e.chain);var o=n,i=kt(o);Tt(u,function(e){var u=n[e]=t[e];i&&(o.prototype[e]=function(){var t=this.__chain__,e=this.__wrapped__,i=[e];if(je.apply(i,arguments),i=u.apply(n,i),r||t){if(e===i&&xt(i))return this;i=new o(i),i.__chain__=t}return i})})}function Xt(){}function Yt(n){return function(t){return t[n]}}function Zt(){return this.__wrapped__}e=e?nt.defaults(J.Object(),e,nt.pick(J,D)):J;var ne=e.Array,te=e.Boolean,ee=e.Date,re=e.Function,ue=e.Math,oe=e.Number,ie=e.Object,ae=e.RegExp,fe=e.String,le=e.TypeError,ce=[],pe=ie.prototype,se=(se=e.window)&&se.document,he=e._,ve=pe.toString,ge=ae("^"+fe(ve).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),ye=ue.ceil,me=e.clearTimeout,be=ue.floor,de=re.prototype.toString,_e=st(_e=ie.getPrototypeOf)&&_e,we=pe.hasOwnProperty,je=ce.push,ke=e.setTimeout,xe=ce.splice,Ce=ce.unshift,Oe=function(){try{var n={},t=st(t=ie.defineProperty)&&t,e=t(n,n,n)&&t }catch(r){}return e}(),Ee=st(Ee=ie.create)&&Ee,Ne=st(Ne=ne.isArray)&&Ne,Ie=e.isFinite,Re=e.isNaN,Se=st(Se=ie.keys)&&Se,Te=ue.max,Ae=ue.min,De=e.parseInt,$e=ue.random,Fe={};Fe[F]=ne,Fe[B]=te,Fe[W]=ee,Fe[q]=re,Fe[P]=ie,Fe[z]=oe,Fe[K]=ae,Fe[L]=fe,H.prototype=d.prototype;var Be=d.support={};Be.funcDecomp=!st(e.WinRTError)&&T.test(s),Be.funcNames=typeof re.name=="string";try{Be.dom=11===se.createDocumentFragment().nodeType}catch(We){Be.dom=false}d.templateSettings={escape:E,evaluate:N,interpolate:I,variable:"",imports:{_:d}},Ee||(Y=function(){function n(){}return function(t){if(xt(t)){n.prototype=t; var r=new n;n.prototype=null}return r||e.Object()}}());var qe=Oe?function(n,t){U.value=t,Oe(n,"__bindData__",U)}:Xt,ze=Ne||function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&ve.call(n)==F||false},Pe=Se?function(n){return xt(n)?Se(n):[]}:g,Ke={"&":"&","<":"<",">":">",'"':""","'":"'"},Le=wt(Ke),Me=ae("("+Pe(Le).join("|")+")","g"),Ve=ae("["+Pe(Ke).join("")+"]","g");Be.dom||(jt=function(n){return n&&typeof n=="object"&&1===n.nodeType&&!Ue(n)||false});var Ue=_e?function(n){if(!n||ve.call(n)!=P)return false; var t=n.valueOf,e=st(t)&&(e=_e(t))&&_e(e);return e?n==e||_e(n)==e:ht(n)}:ht,Ge=ft(function(n,t,e){we.call(n,e)?n[e]++:n[e]=1}),He=ft(function(n,t,e){(we.call(n,e)?n[e]:n[e]=[]).push(t)}),Je=ft(function(n,t,e){n[e]=t}),Qe=Dt,Xe=st(Xe=ee.now)&&Xe||function(){return(new ee).getTime()},Ye=8==De(_+"08")?De:function(n,t){return De(Ot(n)?n.replace(R,""):n,t||0)};return d.after=function(n,t){if(!kt(t))throw new le;return function(){return 1>--n?t.apply(this,arguments):void 0}},d.assign=yt,d.at=function(n){for(var t=arguments,e=-1,r=rt(t,true,false,1),t=t[2]&&t[2][t[1]]===n?1:r.length,u=ne(t);++ef||typeof i=="undefined")return 1;if(it?0:t);++ee(r,i)&&o.push(i)}return o}function p(n,r,t,e){e=(e||0)-1;for(var u=n?n.length:0,o=[];++ee(r,i)&&o.push(i)}return o}function p(n,r,t,e){e=(e||0)-1;for(var u=n?n.length:0,o=[];++eu(f,l))&&(t&&f.push(l),i.push(a))}return i}function h(n){return function(r,t,e){var u={};t=Y(t,e,3),e=-1;var o=r?r.length:0;if(typeof o=="number")for(;++ee?Wr(0,u+e):e||0}else if(e)return e=K(r,t),r[e]===t?e:-1;return n(r,t,e)}function J(n,r,t){if(typeof r!="number"&&null!=r){var u=0,o=-1,i=n?n.length:0;for(r=Y(r,t,3);++o>>1,t(n[e])=y;m?(u&&(u=clearTimeout(u)),c=i,o=n.apply(f,e)):u||(u=setTimeout(v,y))}return m&&a?a=clearTimeout(a):a||r===p||(a=setTimeout(h,r)),t&&(m=true,o=n.apply(f,e)),!m||a||u||(e=f=null),o}}function Y(n,r,t){var e=typeof n;if(null==n||"function"==e)return a(n,r,t);if("object"!=e)return rr(n);var u=Gr(n); -return function(r){for(var t=u.length,e=false;t--&&(e=r[u[t]]===n[u[t]]););return e}}function Z(n){return n}function nr(n){D(T(n),function(r){var t=u[r]=n[r];u.prototype[r]=function(){var n=[this.__wrapped__];return Fr.apply(n,arguments),n=t.apply(u,n),this.__chain__?new o(n,true):n}})}function rr(n){return function(r){return r[n]}}var tr,er=0,ur={},or=+new Date+"",ir=/($^)/,fr=/['\n\r\t\u2028\u2029\\]/g,ar="[object Arguments]",lr="[object Array]",cr="[object Boolean]",pr="[object Date]",sr="[object Number]",gr="[object Object]",hr="[object RegExp]",vr="[object String]",yr={"boolean":false,"function":true,object:true,number:false,string:false,undefined:false},mr={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},_r=yr[typeof window]&&window||this,br=yr[typeof exports]&&exports&&!exports.nodeType&&exports,dr=yr[typeof module]&&module&&!module.nodeType&&module,wr=dr&&dr.exports===br&&br,jr=yr[typeof global]&&global; -!jr||jr.global!==jr&&jr.window!==jr||(_r=jr);var xr=[],Tr=Object.prototype,Er=_r._,Ar=Tr.toString,Or=RegExp("^"+(Ar+"").replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/\b(function)\b.*?(?=\\\()| for .+?(?=\\\])|\btoString\b/g,"$1.*?")+"$"),Sr=Math.ceil,kr=Math.floor,Nr=Function.prototype.toString,Rr=Tr.hasOwnProperty,Fr=xr.push,Br=Tr.propertyIsEnumerable,$r=_($r=Object.create)&&$r,qr=_(qr=Array.isArray)&&qr,Dr=_r.isFinite,Ir=_r.isNaN,Mr=_(Mr=Object.keys)&&Mr,Wr=Math.max,zr=Math.min,Cr=Math.random; -o.prototype=u.prototype;var Pr={};!function(){var n={0:1,length:1};Pr.spliceObjects=(xr.splice.call(n,0,1),!n[0])}(1),u.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},$r||(f=function(){function n(){}return function(r){if(S(r)){n.prototype=r;var t=new n;n.prototype=null}return t||_r.Object()}}()),d(arguments)||(d=function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&Rr.call(n,"callee")&&!Br.call(n,"callee")||false});var Ur=qr||function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&Ar.call(n)==lr||false +return function(r){for(var t=u.length,e=false;t--&&(e=r[u[t]]===n[u[t]]););return e}}function Z(n){return n}function nr(n){D(T(n),function(r){var t=u[r]=n[r];u.prototype[r]=function(){var n=[this.__wrapped__];return Fr.apply(n,arguments),n=t.apply(u,n),this.__chain__?new o(n,true):n}})}function rr(n){return function(r){return r[n]}}var tr,er=0,ur={},or=+new Date+"",ir=/($^)/,fr=/['\n\r\t\u2028\u2029\\]/g,ar="[object Arguments]",lr="[object Array]",cr="[object Boolean]",pr="[object Date]",sr="[object Number]",gr="[object Object]",hr="[object RegExp]",vr="[object String]",yr={"boolean":false,"function":true,object:true,number:false,string:false,undefined:false},mr={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},_r=yr[typeof window]&&window||this,dr=yr[typeof exports]&&exports&&!exports.nodeType&&exports,br=yr[typeof module]&&module&&!module.nodeType&&module,wr=br&&br.exports===dr&&dr,jr=yr[typeof global]&&global; +!jr||jr.global!==jr&&jr.window!==jr||(_r=jr);var xr=[],Tr=Object.prototype,Er=_r._,Ar=Tr.toString,Or=RegExp("^"+(Ar+"").replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),Sr=Math.ceil,kr=Math.floor,Nr=Function.prototype.toString,Rr=Tr.hasOwnProperty,Fr=xr.push,Br=Tr.propertyIsEnumerable,$r=_($r=Object.create)&&$r,qr=_(qr=Array.isArray)&&qr,Dr=_r.isFinite,Ir=_r.isNaN,Mr=_(Mr=Object.keys)&&Mr,Wr=Math.max,zr=Math.min,Cr=Math.random;o.prototype=u.prototype; +var Pr={};!function(){var n={0:1,length:1};Pr.spliceObjects=(xr.splice.call(n,0,1),!n[0])}(1),u.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},$r||(f=function(){function n(){}return function(r){if(S(r)){n.prototype=r;var t=new n;n.prototype=null}return t||_r.Object()}}()),b(arguments)||(b=function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&Rr.call(n,"callee")&&!Br.call(n,"callee")||false});var Ur=qr||function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&Ar.call(n)==lr||false },Vr=function(n){var r=[];if(!n||!yr[typeof n])return r;for(var t in n)Rr.call(n,t)&&r.push(t);return r},Gr=Mr?function(n){return S(n)?Mr(n):[]}:Vr,Hr={"&":"&","<":"<",">":">",'"':""","'":"'"},Jr=E(Hr),Kr=RegExp("("+Gr(Jr).join("|")+")","g"),Lr=RegExp("["+Gr(Hr).join("")+"]","g"),Qr=function(n,r){if(!n||!yr[typeof n])return n;for(var t in n)if(r(n[t],t,n)===ur)break;return n};O(/x/)&&(O=function(n){return typeof n=="function"&&"[object Function]"==Ar.call(n)});var Xr=h(function(n,r,t){Rr.call(n,t)?n[t]++:n[t]=1 }),Yr=h(function(n,r,t){(Rr.call(n,t)?n[t]:n[t]=[]).push(r)}),Zr=h(function(n,r,t){n[t]=r}),nt=M,rt=_(rt=Date.now)&&rt||function(){return(new Date).getTime()};u.after=function(n,r){if(!O(r))throw new TypeError;return function(){return 1>--n?r.apply(this,arguments):void 0}},u.bind=Q,u.bindAll=function(n){for(var r=1i(a,e)){for(r=t;--r;)if(0>i(n[r],e))continue n; +},u.filter=$,u.flatten=function(n,r){return p(n,r)},u.forEach=D,u.functions=T,u.groupBy=Yr,u.indexBy=Zr,u.initial=function(n,r,t){var u=0,o=n?n.length:0;if(typeof r!="number"&&null!=r){var i=o;for(r=Y(r,t,3);i--&&r(n[i],i,n);)u++}else u=null==r||t?1:r||u;return e(n,0,zr(Wr(0,o-u),o))},u.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},u.invert=E,u.invoke=function(n,r){var t=e(arguments,2),u=-1,o=typeof r=="function",i=n?n.length:0,f=Array(typeof i=="number"?i:0);return D(n,function(n){f[++u]=(o?r:n[r]).apply(n,t)}),f},u.keys=Gr,u.map=M,u.max=W,u.memoize=function(n,r){var t={};return function(){var e=r?r.apply(this,arguments):or+arguments[0];return Rr.call(t,e)?t[e]:t[e]=n.apply(this,arguments)}},u.min=function(n,r,t){var e=1/0,u=e;typeof r!="function"&&t&&t[r]===n&&(r=null);var o=-1,i=n?n.length:0;if(null==r&&typeof i=="number")for(;++or?0:r);++nt?Wr(0,e+t):zr(t,e-1))+1);e--;)if(n[e]===r)return e;return-1},u.mixin=nr,u.noConflict=function(){return _r._=Er,this},u.random=function(n,r){return null==n&&null==r&&(r=1),n=+n||0,null==r?(r=n,n=0):r=+r||0,n+kr(Cr()*(r-n+1)) },u.reduce=z,u.reduceRight=C,u.result=function(n,r){if(n){var t=n[r];return O(t)?n[r]():t}},u.size=function(n){var r=n?n.length:0;return typeof r=="number"?r:Gr(n).length},u.some=U,u.sortedIndex=K,u.template=function(n,r,e){var o=u,i=o.templateSettings;n=(n||"")+"",e=j({},e,i);var f=0,a="__p+='",i=e.variable;n.replace(RegExp((e.escape||ir).source+"|"+(e.interpolate||ir).source+"|"+(e.evaluate||ir).source+"|$","g"),function(r,e,u,o,i){return a+=n.slice(f,i).replace(fr,t),e&&(a+="'+_.escape("+e+")+'"),o&&(a+="';"+o+";\n__p+='"),u&&(a+="'+((__t=("+u+"))==null?'':__t)+'"),f=i+r.length,r -}),a+="';",i||(i="obj",a="with("+i+"||{}){"+a+"}"),a="function("+i+"){var __t,__p='',__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}"+a+"return __p}";try{var l=Function("_","return "+a)(o)}catch(c){throw c.source=a,c}return r?l(r):(l.source=a,l)},u.unescape=function(n){return null==n?"":(n+="",0>n.indexOf(";")?n:n.replace(Kr,b))},u.uniqueId=function(n){var r=++er+"";return n?n+r:r},u.all=B,u.any=U,u.detect=q,u.findWhere=function(n,r){return V(n,r,true)},u.foldl=z,u.foldr=C,u.include=F,u.inject=z,u.first=G,u.last=function(n,r,t){var u=0,o=n?n.length:0; +}),a+="';",i||(i="obj",a="with("+i+"||{}){"+a+"}"),a="function("+i+"){var __t,__p='',__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}"+a+"return __p}";try{var l=Function("_","return "+a)(o)}catch(c){throw c.source=a,c}return r?l(r):(l.source=a,l)},u.unescape=function(n){return null==n?"":(n+="",0>n.indexOf(";")?n:n.replace(Kr,d))},u.uniqueId=function(n){var r=++er+"";return n?n+r:r},u.all=B,u.any=U,u.detect=q,u.findWhere=function(n,r){return V(n,r,true)},u.foldl=z,u.foldr=C,u.include=F,u.inject=z,u.first=G,u.last=function(n,r,t){var u=0,o=n?n.length:0; if(typeof r!="number"&&null!=r){var i=o;for(r=Y(r,t,3);i--&&r(n[i],i,n);)u++}else if(u=r,null==u||t)return n?n[o-1]:tr;return e(n,Wr(0,o-u))},u.sample=function(n,r,t){return n&&typeof n.length!="number"&&(n=R(n)),null==r||t?n?n[0+kr(Cr()*(n.length-1-0+1))]:tr:(n=P(n),n.length=zr(Wr(0,r),n.length),n)},u.take=G,u.head=G,nr(w({},u)),u.VERSION="2.4.1",u.prototype.chain=function(){return this.__chain__=true,this},u.prototype.value=function(){return this.__wrapped__},D("pop push reverse shift sort splice unshift".split(" "),function(n){var r=xr[n]; -u.prototype[n]=function(){var n=this.__wrapped__;return r.apply(n,arguments),Pr.spliceObjects||0!==n.length||delete n[0],this}}),D(["concat","join","slice"],function(n){var r=xr[n];u.prototype[n]=function(){var n=r.apply(this.__wrapped__,arguments);return this.__chain__&&(n=new o(n),n.__chain__=true),n}}),typeof define=="function"&&typeof define.amd=="object"&&define.amd?(_r._=u, define(function(){return u})):br&&dr?wr?(dr.exports=u)._=u:br._=u:_r._=u}).call(this); \ No newline at end of file +u.prototype[n]=function(){var n=this.__wrapped__;return r.apply(n,arguments),Pr.spliceObjects||0!==n.length||delete n[0],this}}),D(["concat","join","slice"],function(n){var r=xr[n];u.prototype[n]=function(){var n=r.apply(this.__wrapped__,arguments);return this.__chain__&&(n=new o(n),n.__chain__=true),n}}),typeof define=="function"&&typeof define.amd=="object"&&define.amd?(_r._=u, define(function(){return u})):dr&&br?wr?(br.exports=u)._=u:dr._=u:_r._=u}).call(this); \ No newline at end of file diff --git a/lodash.js b/lodash.js index ee331c7fb..88b7c8f2f 100644 --- a/lodash.js +++ b/lodash.js @@ -499,7 +499,7 @@ var reNative = RegExp('^' + String(toString) .replace(/[.*+?^${}()|[\]\\]/g, '\\$&') - .replace(/\b(function)\b.*?(?=\\\()| for .+?(?=\\\])|\btoString\b/g, '$1.*?') + '$' + .replace(/toString|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$' ); /** Native method shortcuts */