From 1f4d6eb0df2783274467b33e7038ae6591a965ec Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Tue, 18 Jun 2013 08:59:58 -0700 Subject: [PATCH] Remove local `clearTimeout` and `setTimeout` vars from the `underscore` build. Former-commit-id: d783c0a387ad96b14db718da04dec43056452042 --- build.js | 11 +++++-- dist/lodash.underscore.js | 2 -- dist/lodash.underscore.min.js | 59 ++++++++++++++++++----------------- 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/build.js b/build.js index be2af2ecd..38fb318ea 100755 --- a/build.js +++ b/build.js @@ -1472,6 +1472,11 @@ .replace(/(return *|= *)_([;)])/g, '$1lodash$2') .replace(/^ *var _ *=.+\n+/m, ''); + // remove local timer variables + source = removeVar(source, 'clearTimeout'); + source = removeVar(source, 'setImmediate'); + source = removeVar(source, 'setTimeout'); + return source; } @@ -2436,6 +2441,9 @@ if (isMobile || (!useLodashMethod('assign') && !useLodashMethod('defaults') && !useLodashMethod('forIn') && !useLodashMethod('forOwn'))) { source = removeKeysOptimization(source); } + if (!useLodashMethod('defer')) { + source = removeDeferFork(source); + } } if (isModern || isUnderscore) { source = removeSupportArgsClass(source); @@ -3478,9 +3486,6 @@ source = removeKeysOptimization(source); source = removeSupportNonEnumArgs(source); } - if (isRemoved(source, 'defer')) { - source = removeSetImmediate(source); - } if (isRemoved(source, 'invert')) { source = replaceVar(source, 'htmlUnescapes', "{'&':'&','<':'<','>':'>','"':'\"',''':\"'\"}"); } diff --git a/dist/lodash.underscore.js b/dist/lodash.underscore.js index f6b46b3d0..38de79173 100644 --- a/dist/lodash.underscore.js +++ b/dist/lodash.underscore.js @@ -179,12 +179,10 @@ /** Native method shortcuts */ var ceil = Math.ceil, - clearTimeout = window.clearTimeout, concat = arrayRef.concat, floor = Math.floor, hasOwnProperty = objectProto.hasOwnProperty, push = arrayRef.push, - setTimeout = window.setTimeout, toString = objectProto.toString; /* Native method shortcuts for methods with the same name as other `lodash` methods */ diff --git a/dist/lodash.underscore.min.js b/dist/lodash.underscore.min.js index c8923adeb..e0d8b7dc4 100644 --- a/dist/lodash.underscore.min.js +++ b/dist/lodash.underscore.min.js @@ -4,32 +4,33 @@ * Build: `lodash underscore exports="amd,commonjs,global,node" -o ./dist/lodash.underscore.js` * Underscore.js 1.4.4 underscorejs.org/LICENSE */ -;!function(n){function r(n,r,t){t=(t||0)-1;for(var e=n.length;++tr||typeof n=="undefined")return 1;if(ne&&(e=t,u=n)}); -else for(;++ou&&(u=t);return u}function k(n,r){var t=-1,e=n?n.length:0;if(typeof e=="number")for(var u=Array(e);++targuments.length;r=W(r,e,4);var o=-1,i=n.length;if(typeof i=="number")for(u&&(t=n[++o]);++oarguments.length;if(typeof u!="number")var i=$r(n),u=i.length;return r=W(r,e,4),N(n,function(e,a,f){a=i?i[--u]:--u,t=o?(o=!1,n[a]):r(t,n[a],a,f) -}),t}function D(n,r,t){var e;r=W(r,t),t=-1;var u=n?n.length:0;if(typeof u=="number")for(;++tt(u,i)&&o.push(i)}return o}function $(n,r,t){if(n){var e=0,u=n.length;if(typeof r!="number"&&null!=r){var o=-1;for(r=W(r,t);++oe?Fr(0,u+e):e||0}else if(e)return e=P(n,t),n[e]===t?e:-1;return n?r(n,t,e):-1}function C(n,r,t){if(typeof r!="number"&&null!=r){var e=0,u=-1,o=n?n.length:0;for(r=W(r,t);++u>>1,t(n[e])o(f,l))&&(t&&f.push(l),a.push(e))}return a}function V(n,r){return Mr.fastBind||xr&&2"']/g,Z=/['\n\r\t\u2028\u2029\\]/g,nr="[object Arguments]",rr="[object Array]",tr="[object Boolean]",er="[object Date]",ur="[object Number]",or="[object Object]",ir="[object RegExp]",ar="[object String]",fr={"boolean":!1,"function":!0,object:!0,number:!1,string:!1,undefined:!1},lr={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},cr=fr[typeof exports]&&exports,pr=fr[typeof module]&&module&&module.exports==cr&&module,sr=fr[typeof global]&&global; -!sr||sr.global!==sr&&sr.window!==sr||(n=sr);var vr=[],sr=Object.prototype,gr=n._,hr=RegExp("^"+(sr.valueOf+"").replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/valueOf|for [^\]]+/g,".+?")+"$"),yr=Math.ceil,mr=n.clearTimeout,_r=vr.concat,dr=Math.floor,br=sr.hasOwnProperty,jr=vr.push,wr=n.setTimeout,Ar=sr.toString,xr=hr.test(xr=Ar.bind)&&xr,Or=hr.test(Or=Object.create)&&Or,Er=hr.test(Er=Array.isArray)&&Er,Sr=n.isFinite,Nr=n.isNaN,Br=hr.test(Br=Object.keys)&&Br,Fr=Math.max,kr=Math.min,qr=Math.random,Rr=vr.slice,sr=hr.test(n.attachEvent),Dr=xr&&!/\n|true/.test(xr+sr); -i.prototype=o.prototype;var Mr={};!function(){var n={0:1,length:1};Mr.fastBind=xr&&!Dr,Mr.spliceObjects=(vr.splice.call(n,0,1),!n[0])}(1),o.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},Or||(f=function(n){if(b(n)){u.prototype=n;var r=new u;u.prototype=null}return r||{}}),s(arguments)||(s=function(n){return n?br.call(n,"callee"):!1});var Tr=Er||function(n){return n?typeof n=="object"&&Ar.call(n)==rr:!1},Er=function(n){var r,t=[]; -if(!n||!fr[typeof n])return t;for(r in n)br.call(n,r)&&t.push(r);return t},$r=Br?function(n){return b(n)?Br(n):[]}:Er,Ir={"&":"&","<":"<",">":">",'"':""","'":"'"},zr=y(Ir),Cr=function(n,r){var t;if(!n||!fr[typeof n])return n;for(t in n)if(r(n[t],t,n)===K)break;return n},Pr=function(n,r){var t;if(!n||!fr[typeof n])return n;for(t in n)if(br.call(n,t)&&r(n[t],t,n)===K)break;return n};d(/x/)&&(d=function(n){return typeof n=="function"&&"[object Function]"==Ar.call(n)}),o.after=function(n,r){return 1>n?r():function(){return 1>--n?r.apply(this,arguments):void 0 -}},o.bind=V,o.bindAll=function(n){for(var r=1u(i,a)){for(var f=t;--f;)if(0>u(r[f],a))continue n;i.push(a)}}return i},o.invert=y,o.invoke=function(n,r){var t=Rr.call(arguments,2),e=-1,u=typeof r=="function",o=n?n.length:0,i=Array(typeof o=="number"?o:0); -return N(n,function(n){i[++e]=(u?r:n[r]).apply(n,t)}),i},o.keys=$r,o.map=B,o.max=F,o.memoize=function(n,r){var t={};return function(){var e=L+(r?r.apply(this,arguments):arguments[0]);return br.call(t,e)?t[e]:t[e]=n.apply(this,arguments)}},o.min=function(n,r,t){var e=1/0,u=e,o=-1,i=n?n.length:0;if(r||typeof i!="number")r=W(r,t),N(n,function(n,t,o){t=r(n,t,o),tr(t,u)&&(e[u]=n) -}),e},o.once=function(n){var r,t;return function(){return r?t:(r=!0,t=n.apply(this,arguments),n=null,t)}},o.pairs=function(n){for(var r=-1,t=$r(n),e=t.length,u=Array(e);++rt?0:t);++rt?Fr(0,e+t):kr(t,e-1))+1);e--;)if(n[e]===r)return e;return-1},o.mixin=H,o.noConflict=function(){return n._=gr,this},o.random=function(n,r){null==n&&null==r&&(r=1),n=+n||0,null==r?(r=n,n=0):r=+r||0;var t=qr();return n%1||r%1?n+kr(t*(r-n+parseFloat("1e-"+((t+"").length-1))),r):n+dr(t*(r-n+1))},o.reduce=q,o.reduceRight=R,o.result=function(n,r){var t=n?n[r]:null; -return d(t)?n[r]():t},o.size=function(n){var r=n?n.length:0;return typeof r=="number"?r:$r(n).length},o.some=D,o.sortedIndex=P,o.template=function(n,r,t){var u=o.templateSettings;n||(n=""),t=g({},t,u);var i=0,a="__p+='",u=t.variable;n.replace(RegExp((t.escape||X).source+"|"+(t.interpolate||X).source+"|"+(t.evaluate||X).source+"|$","g"),function(r,t,u,o,f){return a+=n.slice(i,f).replace(Z,e),t&&(a+="'+_['escape']("+t+")+'"),o&&(a+="';"+o+";__p+='"),u&&(a+="'+((__t=("+u+"))==null?'':__t)+'"),i=f+r.length,r -}),a+="';\n",u||(u="obj",a="with("+u+"||{}){"+a+"}"),a="function("+u+"){var __t,__p='',__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}"+a+"return __p}";try{var f=Function("_","return "+a)(o)}catch(l){throw l.source=a,l}return r?f(r):(f.source=a,f)},o.unescape=function(n){return null==n?"":(n+"").replace(Q,p)},o.uniqueId=function(n){var r=++J+"";return n?n+r:r},o.all=O,o.any=D,o.detect=S,o.findWhere=function(n,r){return M(n,r,!0)},o.foldl=q,o.foldr=R,o.include=x,o.inject=q,o.first=$,o.last=function(n,r,t){if(n){var e=0,u=n.length; -if(typeof r!="number"&&null!=r){var o=u;for(r=W(r,t);o--&&r(n[o],o,n);)e++}else if(e=r,null==e||t)return n[u-1];return Rr.call(n,Fr(0,u-e))}},o.take=$,o.head=$,H(o),o.VERSION="1.3.1",o.prototype.chain=function(){return this.__chain__=!0,this},o.prototype.value=function(){return this.__wrapped__},N("pop push reverse shift sort splice unshift".split(" "),function(n){var r=vr[n];o.prototype[n]=function(){var n=this.__wrapped__;return r.apply(n,arguments),!Mr.spliceObjects&&0===n.length&&delete n[0],this -}}),N(["concat","join","slice"],function(n){var r=vr[n];o.prototype[n]=function(){var n=r.apply(this.__wrapped__,arguments);return this.__chain__&&(n=new i(n),n.__chain__=!0),n}}),typeof define=="function"&&typeof define.amd=="object"&&define.amd?(n._=o, define(function(){return o})):cr&&!cr.nodeType?pr?(pr.exports=o)._=o:cr._=o:n._=o}(this); \ No newline at end of file +;!function(n){function t(n,t){var r;if(n&>[typeof n])for(r in n)if(Ot.call(n,r)&&t(n[r],r,n)===nt)break}function r(n,t){var r;if(n&>[typeof n])for(r in n)if(t(n[r],r,n)===nt)break}function e(n){var t,r=[];if(!n||!gt[typeof n])return r;for(t in n)Ot.call(n,t)&&r.push(t);return r}function u(n,t,r){r=(r||0)-1;for(var e=n.length;++rt||typeof n=="undefined")return 1;if(ne&&(e=r,u=n)});else for(;++ou&&(u=r);return u}function R(n,t){var r=-1,e=n?n.length:0;if(typeof e=="number")for(var u=Array(e);++rarguments.length;r=J(r,u,4);var i=-1,a=n.length;if(typeof a=="number")for(o&&(e=n[++i]);++iarguments.length;if(typeof u!="number")var i=Pt(n),u=i.length;return t=J(t,e,4),B(n,function(e,a,f){a=i?i[--u]:--u,r=o?(o=Y,n[a]):t(r,n[a],a,f)}),r}function $(n,r,e){var u;r=J(r,e),e=-1;var o=n?n.length:0;if(typeof o=="number")for(;++er(u,i)&&o.push(i)}return o}function C(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&t!=X){var o=-1;for(t=J(t,r);++or?Rt(0,e+r):r||0}else if(r)return r=W(n,t),n[r]===t?r:-1;return n?u(n,t,r):-1}function V(n,t,r){if(typeof t!="number"&&t!=X){var e=0,u=-1,o=n?n.length:0;for(t=J(t,r);++u>>1,r(n[e])o(f,c))&&(r&&f.push(c),a.push(e))}return a}function H(n,t){return zt.fastBind||Tt&&2"']/g,ot=/['\n\r\t\u2028\u2029\\]/g,it="[object Arguments]",at="[object Array]",ft="[object Boolean]",ct="[object Date]",lt="[object Number]",pt="[object Object]",st="[object RegExp]",vt="[object String]",gt={"boolean":Y,"function":Q,object:Q,number:Y,string:Y,undefined:Y},ht={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},yt=gt[typeof exports]&&exports,mt=gt[typeof module]&&module&&module.exports==yt&&module,_t=gt[typeof global]&&global; +!_t||_t.global!==_t&&_t.window!==_t||(n=_t);var dt=[],_t=Object.prototype,bt=n._,jt=RegExp("^"+(_t.valueOf+"").replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/valueOf|for [^\]]+/g,".+?")+"$"),wt=Math.ceil,At=dt.concat,xt=Math.floor,Ot=_t.hasOwnProperty,Et=dt.push,St=_t.toString,Tt=jt.test(Tt=St.bind)&&Tt,Nt=jt.test(Nt=Object.create)&&Nt,kt=jt.test(kt=Array.isArray)&&kt,Bt=n.isFinite,Ft=n.isNaN,qt=jt.test(qt=Object.keys)&&qt,Rt=Math.max,Dt=Math.min,Mt=Math.random,$t=dt.slice,_t=jt.test(n.attachEvent),It=Tt&&!/\n|true/.test(Tt+_t); +c.prototype=f.prototype;var zt={};!function(){var n={0:1,length:1};zt.fastBind=Tt&&!It,zt.spliceObjects=(dt.splice.call(n,0,1),!n[0])}(1),f.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},Nt||(p=function(n){if(A(n)){a.prototype=n;var t=new a;a.prototype=X}return t||{}}),h(arguments)||(h=function(n){return n?Ot.call(n,"callee"):Y});var Ct=kt||function(n){return n?typeof n=="object"&&St.call(n)==at:Y},Pt=qt?function(n){return A(n)?qt(n):[] +}:e,Ut={"&":"&","<":"<",">":">",'"':""","'":"'"},Vt=d(Ut);w(/x/)&&(w=function(n){return typeof n=="function"&&"[object Function]"==St.call(n)}),f.after=function(n,t){return 1>n?t():function(){return 1>--n?t.apply(this,arguments):void 0}},f.bind=H,f.bindAll=function(n){for(var t=1u(i,a)){for(var f=r;--f;)if(0>u(t[f],a))continue n;i.push(a)}}return i},f.invert=d,f.invoke=function(n,t){var r=$t.call(arguments,2),e=-1,u=typeof t=="function",o=n?n.length:0,i=Array(typeof o=="number"?o:0);return B(n,function(n){i[++e]=(u?t:n[t]).apply(n,r)}),i},f.keys=Pt,f.map=F,f.max=q,f.memoize=function(n,t){var r={};return function(){var e=tt+(t?t.apply(this,arguments):arguments[0]); +return Ot.call(r,e)?r[e]:r[e]=n.apply(this,arguments)}},f.min=function(n,t,r){var e=1/0,u=e,o=-1,i=n?n.length:0;if(t||typeof i!="number")t=J(t,r),B(n,function(n,r,o){r=t(n,r,o),rt(e,r)&&(u[r]=n)}),u},f.once=function(n){var t,r;return function(){return t?r:(t=Q,r=n.apply(this,arguments),n=X,r)}},f.pairs=function(n){for(var t=-1,r=Pt(n),e=r.length,u=Array(e);++tr?0:r);++tr?Rt(0,e+r):Dt(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},f.mixin=L,f.noConflict=function(){return n._=bt,this},f.random=function(n,t){n==X&&t==X&&(t=1),n=+n||0,t==X?(t=n,n=0):t=+t||0;var r=Mt();return n%1||t%1?n+Dt(r*(t-n+parseFloat("1e-"+((r+"").length-1))),t):n+xt(r*(t-n+1))},f.reduce=D,f.reduceRight=M,f.result=function(n,t){var r=n?n[t]:X;return w(r)?n[t]():r},f.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:Pt(n).length},f.some=$,f.sortedIndex=W,f.template=function(n,t,r){var e=f.templateSettings; +n||(n=""),r=m({},r,e);var u=0,o="__p+='",e=r.variable;n.replace(RegExp((r.escape||et).source+"|"+(r.interpolate||et).source+"|"+(r.evaluate||et).source+"|$","g"),function(t,r,e,a,f){return o+=n.slice(u,f).replace(ot,i),r&&(o+="'+_['escape']("+r+")+'"),a&&(o+="';"+a+";__p+='"),e&&(o+="'+((__t=("+e+"))==null?'':__t)+'"),u=f+t.length,t}),o+="';\n",e||(e="obj",o="with("+e+"||{}){"+o+"}"),o="function("+e+"){var __t,__p='',__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}"+o+"return __p}"; +try{var a=Function("_","return "+o)(f)}catch(c){throw c.source=o,c}return t?a(t):(a.source=o,a)},f.unescape=function(n){return n==X?"":(n+"").replace(rt,g)},f.uniqueId=function(n){var t=++Z+"";return n?n+t:t},f.all=T,f.any=$,f.detect=k,f.findWhere=function(n,t){return I(n,t,Q)},f.foldl=D,f.foldr=M,f.include=S,f.inject=D,f.first=C,f.last=function(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&t!=X){var o=u;for(t=J(t,r);o--&&t(n[o],o,n);)e++}else if(e=t,e==X||r)return n[u-1];return $t.call(n,Rt(0,u-e)) +}},f.take=C,f.head=C,L(f),f.VERSION="1.3.1",f.prototype.chain=function(){return this.__chain__=Q,this},f.prototype.value=function(){return this.__wrapped__},B("pop push reverse shift sort splice unshift".split(" "),function(n){var t=dt[n];f.prototype[n]=function(){var n=this.__wrapped__;return t.apply(n,arguments),!zt.spliceObjects&&0===n.length&&delete n[0],this}}),B(["concat","join","slice"],function(n){var t=dt[n];f.prototype[n]=function(){var n=t.apply(this.__wrapped__,arguments);return this.__chain__&&(n=new c(n),n.__chain__=Q),n +}}),typeof define=="function"&&typeof define.amd=="object"&&define.amd?(n._=f, define(function(){return f})):yt&&!yt.nodeType?mt?(mt.exports=f)._=f:yt._=f:n._=f}(this); \ No newline at end of file