From 44c10d720a0363ed57f61fda8feceeb0252dce1d Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Fri, 9 Aug 2013 08:22:38 -0700 Subject: [PATCH] Use `Date.now` in modern builds. Former-commit-id: de4329c5f4eaa92da8447e1232ce28e00a0f885d --- build.js | 7 +++- build/pre-compile.js | 1 + dist/lodash.compat.js | 12 +++--- dist/lodash.compat.min.js | 4 +- dist/lodash.js | 13 ++++--- dist/lodash.min.js | 70 +++++++++++++++++------------------ dist/lodash.underscore.js | 12 +++--- dist/lodash.underscore.min.js | 4 +- lodash.js | 13 ++++--- 9 files changed, 72 insertions(+), 64 deletions(-) diff --git a/build.js b/build.js index fe986ff7e..e881eb5ed 100644 --- a/build.js +++ b/build.js @@ -3106,7 +3106,7 @@ source = removeSupportProp(source, 'fastBind'); source = replaceSupportProp(source, 'argsClass', 'false'); - // remove native `Function#bind` branch in `_.bind` + // remove native `Function#bind` branch in `createBound` source = source.replace(matchFunction(source, 'createBound'), function(match) { return match.replace(/(?:\s*\/\/.*)*\n( *)if *\([^{]+?nativeBind[\s\S]+?\n\1else *\{([\s\S]+?)\n\1}/, function(match, indent, snippet) { return snippet @@ -3171,6 +3171,11 @@ return match.replace(/(?: *\/\/.*\n)*( *return ai[^:]+:).+/, '$1 1;'); }); + // replace `+new Date` with `Date.now` use in `_.debounce + source = source.replace(matchFunction(source, 'debounce'), function(match) { + return match.replace(/\+new Date\b/g, 'now()'); + }); + // remove `shimIsPlainObject` from `_.isPlainObject` source = source.replace(matchFunction(source, 'isPlainObject'), function(match) { return match.replace(/!getPrototypeOf[^:]+:\s*/, ''); diff --git a/build/pre-compile.js b/build/pre-compile.js index ad34b0f27..8dfaa2ca3 100644 --- a/build/pre-compile.js +++ b/build/pre-compile.js @@ -202,6 +202,7 @@ 'nodeClass', 'nonEnumArgs', 'nonEnumShadows', + 'now', 'null', 'number', 'object', diff --git a/dist/lodash.compat.js b/dist/lodash.compat.js index 07d03bed8..1d2b999e6 100644 --- a/dist/lodash.compat.js +++ b/dist/lodash.compat.js @@ -5320,7 +5320,7 @@ clear(); if (isCalled) { if (maxWait !== false) { - lastCalled = new Date; + lastCalled = +new Date; } result = func.apply(thisArg, args); } @@ -5329,7 +5329,7 @@ var maxDelayed = function() { clear(); if (trailing || (maxWait !== wait)) { - lastCalled = new Date; + lastCalled = +new Date; result = func.apply(thisArg, args); } }; @@ -5348,15 +5348,15 @@ result = func.apply(thisArg, args); } } else { - var now = new Date; + var stamp = +new Date; if (!maxTimeoutId && !leading) { - lastCalled = now; + lastCalled = stamp; } - var remaining = maxWait - (now - lastCalled); + var remaining = maxWait - (stamp - lastCalled); if (remaining <= 0) { clearTimeout(maxTimeoutId); maxTimeoutId = null; - lastCalled = now; + lastCalled = stamp; result = func.apply(thisArg, args); } else if (!maxTimeoutId) { diff --git a/dist/lodash.compat.min.js b/dist/lodash.compat.min.js index d2558bf8a..ff1672f66 100644 --- a/dist/lodash.compat.min.js +++ b/dist/lodash.compat.min.js @@ -22,8 +22,8 @@ e+="}"}return(n.b||$r.nonEnumArgs)&&(e+="}"),e+=n.c+";return E",t=t("d,j,k,m,o,p }}else t=!t&&_t(n)?u:_.createCallback(t,r,3),Ur(n,function(n,r,u){r=t(n,r,u),r>e&&(e=r,o=n)});return o}function It(n,t,r,e){var u=3>arguments.length;if(t=Y(t,e,4),zr(n)){var o=-1,a=n.length;for(u&&(r=n[++o]);++oarguments.length;return t=Y(t,e,4),Ot(n,function(n,e,o){r=u?(u=b,n):t(r,n,e,o)}),r}function Pt(n,t,r){var e;if(t=_.createCallback(t,r,3),zr(n)){r=-1;for(var u=n.length;++r=E&&u===t;if(c){var l=a(i);l?(u=r,i=l):c=b}for(;++eu(i,l)&&f.push(l);return c&&g(i),f}function Nt(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&t!=d){var o=-1;for(t=_.createCallback(t,r,3);++oe?Sr(0,u+e):e||0}else if(e)return e=$t(n,r),n[e]===r?e:-1; return n?t(n,r,e):-1}function Rt(n,t,r){if(typeof t!="number"&&t!=d){var e=0,u=-1,o=n?n.length:0;for(t=_.createCallback(t,r,3);++u>>1,r(n[e])r?0:r);++tc&&(i=n.apply(f,a));else{var r=new Vt;!s&&!v&&(l=r);var o=p-(r-l);0c&&(i=n.apply(f,a));else{var r=+new Vt;!s&&!v&&(l=r);var o=p-(r-l);0t||typeof n=="undefined")return 1;if(nr?0:r);++er?0:r);++e=k&&i===t,h=u||v?f():l;if(v){var g=a(h);g?(i=r,h=g):(v=_,h=u?h:(p(h),l)) -}for(;++oi(h,y))&&((u||v)&&h.push(y),l.push(g))}return v?(p(h.b),s(h)):u&&p(h),l}function it(n){return function(t,r,e){var u={};return r=Z.createCallback(r,e,3),Ot(t,function(t,e,o){e=rr(r(t,e,o)),n(u,t,e,o)}),u}}function ft(n,t,r,e,u,o){var a=1&t,i=2&t,f=4&t,c=16&t;if(!i&&!mt(n))throw new er;var l=n&&n.__bindData__;if(l)return a&&!(1&l[1])&&(l[4]=u),f&&!(4&l[1])&&(l[5]=o),r&&gr.apply(l[2]||(l[2]=[]),r),e&&gr.apply(l[3]||(l[3]=[]),e),l[1]|=t,ft.apply(m,l); -if(!a||i||f||c||!(Dr.fastBind||wr&&r.length))p=function(){var c=arguments,v=a?u:this;return r&&dr.apply(c,r),e&&gr.apply(c,e),f&&c.lengthr?Er(0,o+r):r)||0,o&&typeof o=="number"?a=-1<(dt(n)?n.indexOf(t,r):u(n,t,r)):d(n,function(n){return++e=k&&i===t,h=u||v?f():l;if(v){var g=a(h);g?(i=r,h=g):(v=_,h=u?h:(p(h),l)) +}for(;++oi(h,y))&&((u||v)&&h.push(y),l.push(g))}return v?(p(h.b),s(h)):u&&p(h),l}function it(n){return function(t,r,e){var u={};return r=Z.createCallback(r,e,3),Ot(t,function(t,e,o){e=rr(r(t,e,o)),n(u,t,e,o)}),u}}function ft(n,t,r,e,u,o){var a=1&t,i=2&t,f=4&t,c=16&t;if(!i&&!mt(n))throw new er;var l=n&&n.__bindData__;if(l)return a&&!(1&l[1])&&(l[4]=u),f&&!(4&l[1])&&(l[5]=o),r&&yr.apply(l[2]||(l[2]=[]),r),e&&yr.apply(l[3]||(l[3]=[]),e),l[1]|=t,ft.apply(m,l); +if(!a||i||f||c||!(Fr.fastBind||jr&&r.length))p=function(){var c=arguments,v=a?u:this;return r&&wr.apply(c,r),e&&yr.apply(c,e),f&&c.lengthr?Ir(0,o+r):r)||0,o&&typeof o=="number"?a=-1<(dt(n)?n.indexOf(t,r):u(n,t,r)):d(n,function(n){return++eo&&(o=i)}}else t=!t&&dt(n)?u:Z.createCallback(t,r,3),Ot(n,function(n,r,u){r=t(n,r,u),r>e&&(e=r,o=n) +return n}function Et(n,t,r){var e=n?n.length:0;if(typeof e!="number")var u=qr(n),e=u.length;return t=rt(t,r,3),Ot(n,function(r,o,a){return o=u?u[--e]:--e,t(n[o],o,a)}),n}function It(n,t,r){var e=-1,u=n?n.length:0;if(t=Z.createCallback(t,r,3),typeof u=="number")for(var o=Ht(u);++eo&&(o=i)}}else t=!t&&dt(n)?u:Z.createCallback(t,r,3),Ot(n,function(n,r,u){r=t(n,r,u),r>e&&(e=r,o=n) });return o}function At(n,t){var r=-1,e=n?n.length:0;if(typeof e=="number")for(var u=Ht(e);++rarguments.length;t=rt(t,e,4);var o=-1,a=n.length;if(typeof a=="number")for(u&&(r=n[++o]);++oarguments.length;return t=rt(t,e,4),Et(n,function(n,e,o){r=u?(u=_,n):t(r,n,e,o)}),r}function Bt(n,t,r){var e;t=Z.createCallback(t,r,3),r=-1; -var u=n?n.length:0;if(typeof u=="number")for(;++r=k&&u===t;if(c){var l=a(i);l?(u=r,i=l):c=_}for(;++eu(i,l)&&f.push(l);return c&&s(i),f}function Dt(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&t!=m){var o=-1;for(t=Z.createCallback(t,r,3);++oe?Er(0,u+e):e||0}else if(e)return e=zt(n,r),n[e]===r?e:-1;return n?t(n,r,e):-1}function Tt(n,t,r){if(typeof t!="number"&&t!=m){var e=0,u=-1,o=n?n.length:0;for(t=Z.createCallback(t,r,3);++u>>1,r(n[e])r?0:r);++tc&&(i=n.apply(f,a));else{var r=new Qt;!s&&!g&&(l=r);var o=p-(r-l);0/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:N,variable:"",imports:{_:Z}};var Fr=lr?function(n,t){var r=c();r.value=t,lr(n,"__bindData__",r),s(r)}:l,Tr=kr,zr=Or?function(n){return _t(n)?Or(n):[]}:X,qr={"&":"&","<":"<",">":">",'"':""","'":"'"},Wr=yt(qr),Pr=tr("("+zr(Wr).join("|")+")","g"),Kr=tr("["+zr(qr).join("")+"]","g"),Lr=it(function(n,t,r){hr.call(n,r)?n[r]++:n[r]=1 -}),Mr=it(function(n,t,r){(hr.call(n,r)?n[r]:n[r]=[]).push(t)}),Ur=it(function(n,t,r){n[r]=t});Br&&Q&&typeof yr=="function"&&(Mt=function(n){if(!mt(n))throw new er;return yr.apply(e,arguments)});var Vr=8==Sr(C+"08")?Sr:function(n,t){return Sr(dt(n)?n.replace(R,""):n,t||0)};return Z.after=function(n,t){if(!mt(t))throw new er;return function(){return 1>--n?t.apply(this,arguments):void 0}},Z.assign=J,Z.at=function(n){for(var t=-1,r=et(arguments,y,_,1),e=r.length,u=Ht(e);++t=k&&a(o?e[o]:g)}n:for(;++c(m?r(m,y):l(g,y))){for(o=u,(m||g).push(y);--o;)if(m=i[o],0>(m?r(m,y):l(e[o],y)))continue n;h.push(y)}}for(;u--;)(m=i[u])&&s(m);return p(i),p(g),h},Z.invert=yt,Z.invoke=function(n,t){var r=Nr.call(arguments,2),e=-1,u=typeof t=="function",o=n?n.length:0,a=Ht(typeof o=="number"?o:0);return Ot(n,function(n){a[++e]=(u?t:n[t]).apply(n,r)}),a},Z.keys=zr,Z.map=It,Z.max=St,Z.memoize=function(n,t){function r(){var e=r.cache,u=j+(t?t.apply(this,arguments):arguments[0]); -return hr.call(e,u)?e[u]:e[u]=n.apply(this,arguments)}if(!mt(n))throw new er;return r.cache={},r},Z.merge=function(n){var t=arguments,r=2;if(!_t(n))return n;if("number"!=typeof t[2]&&(r=t.length),3e(a,r))&&(o[r]=n)}),o},Z.once=function(n){var t,r;if(!mt(n))throw new er;return function(){return t?r:(t=y,r=n.apply(this,arguments),n=m,r)}},Z.pairs=function(n){for(var t=-1,r=zr(n),e=r.length,u=Ht(e);++t=k&&u===t;if(c){var l=a(i);l?(u=r,i=l):c=_}for(;++eu(i,l)&&f.push(l);return c&&s(i),f}function Dt(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&t!=m){var o=-1;for(t=Z.createCallback(t,r,3);++oe?Ir(0,u+e):e||0}else if(e)return e=zt(n,r),n[e]===r?e:-1;return n?t(n,r,e):-1}function Tt(n,t,r){if(typeof t!="number"&&t!=m){var e=0,u=-1,o=n?n.length:0;for(t=Z.createCallback(t,r,3);++u>>1,r(n[e])r?0:r);++tc&&(i=n.apply(f,a));else{var r=gr();!s&&!g&&(l=r);var o=p-(r-l);0/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:N,variable:"",imports:{_:Z}};var Tr=lr?function(n,t){var r=c();r.value=t,lr(n,"__bindData__",r),s(r)}:l,zr=xr,qr=Er?function(n){return _t(n)?Er(n):[]}:X,Wr={"&":"&","<":"<",">":">",'"':""","'":"'"},Pr=yt(Wr),Kr=tr("("+qr(Pr).join("|")+")","g"),Lr=tr("["+qr(Wr).join("")+"]","g"),Mr=it(function(n,t,r){hr.call(n,r)?n[r]++:n[r]=1 +}),Ur=it(function(n,t,r){(hr.call(n,r)?n[r]:n[r]=[]).push(t)}),Vr=it(function(n,t,r){n[r]=t});$r&&Q&&typeof mr=="function"&&(Mt=function(n){if(!mt(n))throw new er;return mr.apply(e,arguments)});var Gr=8==Ar(C+"08")?Ar:function(n,t){return Ar(dt(n)?n.replace(R,""):n,t||0)};return Z.after=function(n,t){if(!mt(t))throw new er;return function(){return 1>--n?t.apply(this,arguments):void 0}},Z.assign=J,Z.at=function(n){for(var t=-1,r=et(arguments,y,_,1),e=r.length,u=Ht(e);++t=k&&a(o?e[o]:g)}n:for(;++c(m?r(m,y):l(g,y))){for(o=u,(m||g).push(y);--o;)if(m=i[o],0>(m?r(m,y):l(e[o],y)))continue n;h.push(y)}}for(;u--;)(m=i[u])&&s(m);return p(i),p(g),h},Z.invert=yt,Z.invoke=function(n,t){var r=Rr.call(arguments,2),e=-1,u=typeof t=="function",o=n?n.length:0,a=Ht(typeof o=="number"?o:0);return Ot(n,function(n){a[++e]=(u?t:n[t]).apply(n,r)}),a},Z.keys=qr,Z.map=It,Z.max=St,Z.memoize=function(n,t){function r(){var e=r.cache,u=j+(t?t.apply(this,arguments):arguments[0]); +return hr.call(e,u)?e[u]:e[u]=n.apply(this,arguments)}if(!mt(n))throw new er;return r.cache={},r},Z.merge=function(n){var t=arguments,r=2;if(!_t(n))return n;if("number"!=typeof t[2]&&(r=t.length),3e(a,r))&&(o[r]=n)}),o},Z.once=function(n){var t,r;if(!mt(n))throw new er;return function(){return t?r:(t=y,r=n.apply(this,arguments),n=m,r)}},Z.pairs=function(n){for(var t=-1,r=qr(n),e=r.length,u=Ht(e);++tr?Er(0,e+r):Ir(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},Z.mixin=Vt,Z.noConflict=function(){return e._=ar,this},Z.parseInt=Vr,Z.random=function(n,t){n==m&&t==m&&(t=1),n=+n||0,t==m?(t=n,n=0):t=+t||0;var r=Ar();return n%1||t%1?n+Ir(r*(t-n+parseFloat("1e-"+((r+"").length-1))),t):n+pr(r*(t-n+1))},Z.reduce=Nt,Z.reduceRight=Rt,Z.result=function(n,t){var r=n?n[t]:g; -return mt(r)?n[t]():r},Z.runInContext=h,Z.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:zr(n).length},Z.some=Bt,Z.sortedIndex=zt,Z.template=function(n,t,r){var e=Z.templateSettings;n||(n=""),r=H({},r,e);var u,o=H({},r.imports,e.imports),e=zr(o),o=wt(o),a=0,f=r.interpolate||B,c="__p+='",f=tr((r.escape||B).source+"|"+f.source+"|"+(f===N?S:B).source+"|"+(r.evaluate||B).source+"|$","g");n.replace(f,function(t,r,e,o,f,l){return e||(e=o),c+=n.slice(a,l).replace(D,i),r&&(c+="'+__e("+r+")+'"),f&&(u=y,c+="';"+f+";__p+='"),e&&(c+="'+((__t=("+e+"))==null?'':__t)+'"),a=l+t.length,t -}),c+="';\n",f=r=r.variable,f||(r="obj",c="with("+r+"){"+c+"}"),c=(u?c.replace(O,""):c).replace(E,"$1").replace(I,"$1;"),c="function("+r+"){"+(f?"":r+"||("+r+"={});")+"var __t,__p='',__e=_.escape"+(u?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+c+"return __p}";try{var l=Xt(e,"return "+c).apply(g,o)}catch(p){throw p.source=c,p}return t?l(t):(l.source=c,l)},Z.unescape=function(n){return n==m?"":rr(n).replace(Pr,st)},Z.uniqueId=function(n){var t=++w;return rr(n==m?"":n)+t -},Z.all=kt,Z.any=Bt,Z.detect=Ct,Z.findWhere=Ct,Z.foldl=Nt,Z.foldr=Rt,Z.include=jt,Z.inject=Nt,d(Z,function(n,t){Z.prototype[t]||(Z.prototype[t]=function(){var t=[this.__wrapped__],r=this.__chain__;return gr.apply(t,arguments),t=n.apply(Z,t),r?new nt(t,r):t})}),Z.first=Dt,Z.last=function(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&t!=m){var o=u;for(t=Z.createCallback(t,r,3);o--&&t(n[o],o,n);)e++}else if(e=t,e==m||r)return n[u-1];return v(n,Er(0,u-e))}},Z.take=Dt,Z.head=Dt,d(Z,function(n,t){Z.prototype[t]||(Z.prototype[t]=function(t,r){var e=this.__chain__,u=n(this.__wrapped__,t,r); +},Z.transform=function(n,t,r,e){var u=zr(n);return t=rt(t,e,4),r==m&&(u?r=[]:(e=n&&n.constructor,r=_t(e&&e.prototype)?kr(e&&e.prototype):{})),(u?Ot:d)(n,function(n,e,u){return t(r,n,e,u)}),r},Z.union=function(){return at(et(arguments,y,y))},Z.uniq=qt,Z.values=wt,Z.where=xt,Z.without=function(n){return $t(n,Rr.call(arguments,1))},Z.wrap=function(n,t){if(!mt(t))throw new er;return function(){var r=[n];return yr.apply(r,arguments),t.apply(this,r)}},Z.zip=Wt,Z.zipObject=Pt,Z.collect=It,Z.drop=Tt,Z.each=Ot,Z.extend=J,Z.methods=gt,Z.object=Pt,Z.select=xt,Z.tail=Tt,Z.unique=qt,Z.unzip=Wt,Vt(Z),Z.clone=function(n,t,r,e){return typeof t!="boolean"&&t!=m&&(e=r,r=t,t=_),tt(n,t,typeof r=="function"&&rt(r,e,1)) +},Z.cloneDeep=function(n,t,r){return tt(n,y,typeof t=="function"&&rt(t,r,1))},Z.contains=jt,Z.escape=function(n){return n==m?"":rr(n).replace(Lr,ct)},Z.every=kt,Z.find=Ct,Z.findIndex=function(n,t,r){var e=-1,u=n?n.length:0;for(t=Z.createCallback(t,r,3);++er?Ir(0,e+r):Sr(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},Z.mixin=Vt,Z.noConflict=function(){return e._=ar,this},Z.parseInt=Gr,Z.random=function(n,t){n==m&&t==m&&(t=1),n=+n||0,t==m?(t=n,n=0):t=+t||0;var r=Nr();return n%1||t%1?n+Sr(r*(t-n+parseFloat("1e-"+((r+"").length-1))),t):n+pr(r*(t-n+1))},Z.reduce=Nt,Z.reduceRight=Rt,Z.result=function(n,t){var r=n?n[t]:g; +return mt(r)?n[t]():r},Z.runInContext=h,Z.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:qr(n).length},Z.some=Bt,Z.sortedIndex=zt,Z.template=function(n,t,r){var e=Z.templateSettings;n||(n=""),r=H({},r,e);var u,o=H({},r.imports,e.imports),e=qr(o),o=wt(o),a=0,f=r.interpolate||B,c="__p+='",f=tr((r.escape||B).source+"|"+f.source+"|"+(f===N?S:B).source+"|"+(r.evaluate||B).source+"|$","g");n.replace(f,function(t,r,e,o,f,l){return e||(e=o),c+=n.slice(a,l).replace(D,i),r&&(c+="'+__e("+r+")+'"),f&&(u=y,c+="';"+f+";__p+='"),e&&(c+="'+((__t=("+e+"))==null?'':__t)+'"),a=l+t.length,t +}),c+="';\n",f=r=r.variable,f||(r="obj",c="with("+r+"){"+c+"}"),c=(u?c.replace(O,""):c).replace(E,"$1").replace(I,"$1;"),c="function("+r+"){"+(f?"":r+"||("+r+"={});")+"var __t,__p='',__e=_.escape"+(u?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+c+"return __p}";try{var l=Xt(e,"return "+c).apply(g,o)}catch(p){throw p.source=c,p}return t?l(t):(l.source=c,l)},Z.unescape=function(n){return n==m?"":rr(n).replace(Kr,st)},Z.uniqueId=function(n){var t=++w;return rr(n==m?"":n)+t +},Z.all=kt,Z.any=Bt,Z.detect=Ct,Z.findWhere=Ct,Z.foldl=Nt,Z.foldr=Rt,Z.include=jt,Z.inject=Nt,d(Z,function(n,t){Z.prototype[t]||(Z.prototype[t]=function(){var t=[this.__wrapped__],r=this.__chain__;return yr.apply(t,arguments),t=n.apply(Z,t),r?new nt(t,r):t})}),Z.first=Dt,Z.last=function(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&t!=m){var o=u;for(t=Z.createCallback(t,r,3);o--&&t(n[o],o,n);)e++}else if(e=t,e==m||r)return n[u-1];return v(n,Ir(0,u-e))}},Z.take=Dt,Z.head=Dt,d(Z,function(n,t){Z.prototype[t]||(Z.prototype[t]=function(t,r){var e=this.__chain__,u=n(this.__wrapped__,t,r); return!e&&(t==m||r&&typeof t!="function")?u:new nt(u,e)})}),Z.VERSION="1.3.1",Z.prototype.chain=function(){return this.__chain__=y,this},Z.prototype.toString=function(){return rr(this.__wrapped__)},Z.prototype.value=Gt,Z.prototype.valueOf=Gt,Ot(["join","pop","shift"],function(n){var t=ur[n];Z.prototype[n]=function(){var n=this.__chain__,r=t.apply(this.__wrapped__,arguments);return n?new nt(r,n):r}}),Ot(["push","reverse","sort","unshift"],function(n){var t=ur[n];Z.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this }}),Ot(["concat","slice","splice"],function(n){var t=ur[n];Z.prototype[n]=function(){return new nt(t.apply(this.__wrapped__,arguments),this.__chain__)}}),Z}var g,y=!0,m=null,_=!1,b=[],d=[],w=0,j=+new Date+"",k=75,x=40,C=" \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",O=/\b__p\+='';/g,E=/\b(__p\+=)''\+/g,I=/(__e\(.*?\)|\b__t\))\+'';/g,S=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,A=/\w*$/,N=/<%=([\s\S]+?)%>/g,R=RegExp("^["+C+"]*0+(?=.$)"),B=/($^)/,$=($=/\bthis\b/)&&$.test(h)&&$,D=/['\n\r\t\u2028\u2029\\]/g,F="Array Boolean Date Function Math Number Object RegExp String _ attachEvent clearTimeout isFinite isNaN parseInt setImmediate setTimeout".split(" "),T="[object Arguments]",z="[object Array]",q="[object Boolean]",W="[object Date]",P="[object Function]",K="[object Number]",L="[object Object]",M="[object RegExp]",U="[object String]",V={}; V[P]=_,V[T]=V[z]=V[q]=V[W]=V[K]=V[L]=V[M]=V[U]=y;var G={"boolean":_,"function":y,object:y,number:_,string:_,undefined:_},H={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},J=G[typeof exports]&&exports,Q=G[typeof module]&&module&&module.exports==J&&module,X=G[typeof global]&&global;!X||X.global!==X&&X.window!==X||(n=X);var Y=h();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(n._=Y, define(function(){return Y})):J&&!J.nodeType?Q?(Q.exports=Y)._=Y:J._=Y:n._=Y diff --git a/dist/lodash.underscore.js b/dist/lodash.underscore.js index 4dd6473d5..cb54d4ef6 100644 --- a/dist/lodash.underscore.js +++ b/dist/lodash.underscore.js @@ -3670,7 +3670,7 @@ clear(); if (isCalled) { if (maxWait !== false) { - lastCalled = new Date; + lastCalled = +new Date; } result = func.apply(thisArg, args); } @@ -3679,7 +3679,7 @@ var maxDelayed = function() { clear(); if (trailing || (maxWait !== wait)) { - lastCalled = new Date; + lastCalled = +new Date; result = func.apply(thisArg, args); } }; @@ -3698,15 +3698,15 @@ result = func.apply(thisArg, args); } } else { - var now = new Date; + var stamp = +new Date; if (!maxTimeoutId && !leading) { - lastCalled = now; + lastCalled = stamp; } - var remaining = maxWait - (now - lastCalled); + var remaining = maxWait - (stamp - lastCalled); if (remaining <= 0) { clearTimeout(maxTimeoutId); maxTimeoutId = null; - lastCalled = now; + lastCalled = stamp; result = func.apply(thisArg, args); } else if (!maxTimeoutId) { diff --git a/dist/lodash.underscore.min.js b/dist/lodash.underscore.min.js index 2ab70f206..7db6f430d 100644 --- a/dist/lodash.underscore.min.js +++ b/dist/lodash.underscore.min.js @@ -16,8 +16,8 @@ if(!a&&!x(n))throw new TypeError;if(!o||a||f||l||!(Wr.fastBind||Or&&t.length))c= });return t}function I(n,r,t,e){var u=3>arguments.length;return r=a(r,e,4),B(n,function(n,e,i){t=u?(u=!1,n):r(t,n,e,i)}),t}function W(n,r,t){var e;r=K(r,t,3),t=-1;var u=n?n.length:0;if(typeof u=="number")for(;++tt(u,o)&&i.push(o)}return i}function P(n,r,t){if(n){var e=0,u=n.length; if(typeof r!="number"&&null!=r){var i=-1;for(r=K(r,t,3);++ie?Br(0,u+e):e||0}else if(e)return e=G(n,t),n[e]===t?e:-1;return n?r(n,t,e):-1}function V(n,r,t){if(typeof r!="number"&&null!=r){var e=0,u=-1,i=n?n.length:0;for(r=K(r,t,3);++u>>1,t(n[e])o&&(u=n.apply(i,e));else{var t=new Date;!l&&!s&&(a=t);var p=f-(t-a);0o&&(u=n.apply(i,e));else{var t=+new Date;!l&&!s&&(a=t);var p=f-(t-a);0/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},Sr||(v=function(n){if(E(n)){u.prototype=n;var r=new u;u.prototype=null}return r||{}}),m(arguments)||(m=function(n){return n&&typeof n=="object"?xr.call(n,"callee"):!1});var zr=Dr||function(n){return n&&typeof n=="object"?Ar.call(n)==ir:!1},Cr=function(n){var r,t=[]; if(!n||!sr[typeof n])return t;for(r in n)xr.call(n,r)&&t.push(r);return t},Pr=Rr?function(n){return E(n)?Rr(n):[]}:Cr,Ur={"&":"&","<":"<",">":">",'"':""","'":"'","/":"/"},Vr=w(Ur),Gr=RegExp("("+Pr(Vr).join("|")+")","g"),Hr=RegExp("["+Pr(Ur).join("")+"]","g"),Jr=function(n,r){var t;if(!n||!sr[typeof n])return n;for(t in n)if(r(n[t],t,n)===nr)break;return n},Kr=function(n,r){var t;if(!n||!sr[typeof n])return n;for(t in n)if(xr.call(n,t)&&r(n[t],t,n)===nr)break;return n};x(/x/)&&(x=function(n){return typeof n=="function"&&"[object Function]"==Ar.call(n) diff --git a/lodash.js b/lodash.js index 9fb1d66af..a1f861a38 100644 --- a/lodash.js +++ b/lodash.js @@ -497,6 +497,7 @@ fnToString = Function.prototype.toString, getPrototypeOf = reNative.test(getPrototypeOf = Object.getPrototypeOf) && getPrototypeOf, hasOwnProperty = objectProto.hasOwnProperty, + now = reNative.test(now = Date.now) && now, push = arrayRef.push, propertyIsEnumerable = objectProto.propertyIsEnumerable, setImmediate = context.setImmediate, @@ -5372,7 +5373,7 @@ clear(); if (isCalled) { if (maxWait !== false) { - lastCalled = new Date; + lastCalled = +new Date; } result = func.apply(thisArg, args); } @@ -5381,7 +5382,7 @@ var maxDelayed = function() { clear(); if (trailing || (maxWait !== wait)) { - lastCalled = new Date; + lastCalled = +new Date; result = func.apply(thisArg, args); } }; @@ -5400,15 +5401,15 @@ result = func.apply(thisArg, args); } } else { - var now = new Date; + var stamp = +new Date; if (!maxTimeoutId && !leading) { - lastCalled = now; + lastCalled = stamp; } - var remaining = maxWait - (now - lastCalled); + var remaining = maxWait - (stamp - lastCalled); if (remaining <= 0) { clearTimeout(maxTimeoutId); maxTimeoutId = null; - lastCalled = now; + lastCalled = stamp; result = func.apply(thisArg, args); } else if (!maxTimeoutId) {