From 90e2bd0372382f748d71aec7dc68ec9192c4065b Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Mon, 2 Jul 2012 03:43:01 -0400 Subject: [PATCH] Correct variable declaration order. Former-commit-id: 5f5a36057b065799dcc05b0054a2c88f00fad8c0 --- lodash.js | 18 +++++++++--------- lodash.min.js | 38 +++++++++++++++++++------------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/lodash.js b/lodash.js index fec8ccb09..be9e65c82 100644 --- a/lodash.js +++ b/lodash.js @@ -75,15 +75,6 @@ /** Used to store tokenized template text snippets */ var tokenized = []; - /* Detect if `Function#bind` exists and is inferred to be fast (i.e. all but V8) */ - var useNativeBind = nativeBind && /\n|Opera/.test(nativeBind + toString.call(window.opera)); - - /** Detect if sourceURL syntax is usable without erroring */ - try { - // Adobe's and Narwhal's JS engines will error - var useSourceURL = (Function('//@')(), true); - } catch(e){ } - /** Native method shortcuts */ var concat = ArrayProto.concat, hasOwnProperty = ObjectProto.hasOwnProperty, @@ -110,6 +101,15 @@ var clearTimeout = window.clearTimeout, setTimeout = window.setTimeout; + /* Detect if `Function#bind` exists and is inferred to be fast (i.e. all but V8) */ + var useNativeBind = nativeBind && /\n|Opera/.test(nativeBind + toString.call(window.opera)); + + /** Detect if sourceURL syntax is usable without erroring */ + try { + // Adobe's and Narwhal's JS engines will error + var useSourceURL = (Function('//@')(), true); + } catch(e){ } + /** * Used to escape characters for inclusion in HTML. * The `>` and `/` characters don't require escaping in HTML and have no diff --git a/lodash.min.js b/lodash.min.js index 30e680a08..9ab0b7798 100644 --- a/lodash.min.js +++ b/lodash.min.js @@ -4,30 +4,30 @@ */ ;(function(e,t){"use strict";function s(e){return new o(e)}function o(e){if(e&&e._wrapped)return e;this._wrapped=e}function u(){for(var e,t,n,s=-1,o=arguments.length,u={e:"",f:"",k:"",q:"",c:{d:"",m:"++l>>0){"),t+=u.c.d+";while("+u.c.m+"){"+u.c.j+"}",u.o&&(t+="}"));if(u.o){u.c&&(t+="else{"),u.i||(t+="var w=typeof "+u.l+"=='function';"),t+=u.o.d+";for("+u.o.m+"){",u.i?(u.r&&(t+="if("+u.h+"){"),t+=u.o.j+";",u.r&&(t+="}")):(t+="if(!(w&&l=='prototype')",u.r&&(t+="&&"+u.h),t+="){"+u.o.j+"}"),t+="}";if(u.i){t+="var h="+u.l+".constructor;";for(n=0;7>n; -n++)t+="l='"+u.p[n]+"';if(","constructor"==u.p[n]&&(t+="!(h&&h.prototype==="+u.l+")&&"),t+=u.h+"){"+u.o.j+"}"}u.c&&(t+="}")}return t+=u.e+";return v",Function("c,g,i,j,k,n,s,x,A,D",'"use strict";return function('+e+"){"+t+"}")(it,a,ut,Q,k,h,dt,Y,lt,Z)}function a(e,n){return e=e.a,n=n.a,e===t?1:n===t?-1:en?1:0}function f(e,t){return $[t]}function l(e){return"\\"+vt[e]}function c(e){return pt[e]}function h(e,t){return function(n,r,i){return e.call(t,n,r,i)}}function p(){}function d(e,t){var n= -$.length;return $[n]="'+__e("+t+")+'",V+n}function v(e,t){var n=$.length;return $[n]="';"+t+";__p+='",V+n}function m(e,t){var n=$.length;return $[n]="'+((__t=("+t+"))==null?'':__t)+'",V+n}function g(e,t,n,r){if(!e)return n;var i=e.length,s=3>arguments.length;r&&(t=h(t,r));if(i===i>>>0){for(i&&s&&(n=e[--i]);i--;)n=t(n,e[i],i,e);return n}var o=Bt(e);for((i=o.length)&&s&&(n=e[o[--i]]);i--;)s=o[i],n=t(n,e[s],s,e);return n}function y(e,t,n){if(e)return t==r||n?e[0]:Y.call(e,0,t)}function b(e,t){var n= -[];if(!e)return n;for(var r,i=-1,s=e.length;++in?Math.max(0,i+n):n)-1}for(;++ri&&(i=e[s]);return i}for(n&&(t=h(t,n));++sr&&(r=n,i=e[s]);return i}function S(e,t,n){return e?Y.call -(e,t==r||n?1:t):[]}function x(e,t,n,r){if(!e)return 0;var i=0,s=e.length;if(n){r&&(n=N(n,r));for(t=n(t);i>>1,n(e[r])>>1,e[r]w(a,r))a.push(r),s.push(e[o]);return s}function N(e,t){function n(){var u=arguments,a=t;return s||(e=t[i]),o.length&&(u=u.length?K.apply -(o,u):o),this instanceof n?(p.prototype=e.prototype,a=new p,u=e.apply(a,u),dt[typeof u]&&u!==r?u:a):e.apply(a,u)}var i,s=Z.call(e)==ut;if(s){if(J||et&&2++u&&(l=X[u],!Q.call(e,l)||!!(a=Q.call(t,l)&&C(e[l],t[l],s))););}return s.pop(),a}function k(e){return e}function L(e){Ct(Pt(e),function(t){var r=s[t]=e[t];o.prototype[t]=function(){var e=[this._wrapped];return arguments.length&&G.apply(e,arguments),e=r.apply(s,e),this._chain&&(e=new o(e),e._chain=n),e}})}var n=!0,r=null,i=!1,A,O,M="object"==typeof +n++)t+="l='"+u.p[n]+"';if(","constructor"==u.p[n]&&(t+="!(h&&h.prototype==="+u.l+")&&"),t+=u.h+"){"+u.o.j+"}"}u.c&&(t+="}")}return t+=u.e+";return v",Function("c,g,i,j,k,n,s,x,A,D",'"use strict";return function('+e+"){"+t+"}")(rt,a,ot,K,k,h,dt,G,ft,Y)}function a(e,n){return e=e.a,n=n.a,e===t?1:n===t?-1:en?1:0}function f(e,t){return $[t]}function l(e){return"\\"+vt[e]}function c(e){return pt[e]}function h(e,t){return function(n,r,i){return e.call(t,n,r,i)}}function p(){}function d(e,t){var n= +$.length;return $[n]="'+__e("+t+")+'",V+n}function v(e,t){var n=$.length;return $[n]="';"+t+";__p+='",V+n}function m(e,t){var n=$.length;return $[n]="'+((__t=("+t+"))==null?'':__t)+'",V+n}function g(e,t,n,r){if(!e)return n;var i=e.length,s=3>arguments.length;r&&(t=h(t,r));if(i===i>>>0){for(i&&s&&(n=e[--i]);i--;)n=t(n,e[i],i,e);return n}var o=Bt(e);for((i=o.length)&&s&&(n=e[o[--i]]);i--;)s=o[i],n=t(n,e[s],s,e);return n}function y(e,t,n){if(e)return t==r||n?e[0]:G.call(e,0,t)}function b(e,t){var n= +[];if(!e)return n;for(var r,i=-1,s=e.length;++in?Math.max(0,i+n):n)-1}for(;++ri&&(i=e[s]);return i}for(n&&(t=h(t,n));++sr&&(r=n,i=e[s]);return i}function S(e,t,n){return e?G.call +(e,t==r||n?1:t):[]}function x(e,t,n,r){if(!e)return 0;var i=0,s=e.length;if(n){r&&(n=N(n,r));for(t=n(t);i>>1,n(e[r])>>1,e[r]w(a,r))a.push(r),s.push(e[o]);return s}function N(e,t){function n(){var u=arguments,a=t;return s||(e=t[i]),o.length&&(u=u.length?J.apply +(o,u):o),this instanceof n?(p.prototype=e.prototype,a=new p,u=e.apply(a,u),dt[typeof u]&&u!==r?u:a):e.apply(a,u)}var i,s=Y.call(e)==ot;if(s){if(ht||Z&&2++u&&(l=X[u],!K.call(e,l)||!!(a=K.call(t,l)&&C(e[l],t[l],s))););}return s.pop(),a}function k(e){return e}function L(e){Ct(Pt(e),function(t){var r=s[t]=e[t];o.prototype[t]=function(){var e=[this._wrapped];return arguments.length&&Q.apply(e,arguments),e=r.apply(s,e),this._chain&&(e=new o(e),e._chain=n),e}})}var n=!0,r=null,i=!1,A,O,M="object"==typeof exports&&exports&&("object"==typeof global&&global&&global==global.global&&(e=global),exports),_=Array.prototype,D=Object.prototype,P=!{valueOf:0}.propertyIsEnumerable("valueOf"),H=0,B=e._,j=/\b__p\+='';/g,F=/\b__p\+=''\+/g,I=/\b__t\)\+\n'';/g,q=/(?:__e|__t=)\(\s*(?![\s"']|this\.)/g,R=RegExp("^"+(D.valueOf+"").replace(/[.*+?^=!:${}()|[\]\/\\]/g,"\\$&").replace(/valueOf|for [^\]]+/g,".+?")+"$"),U=/__token__(\d+)/g,z=/[&<"']/g,W=/['\n\r\t\u2028\u2029\\]/g,X="constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf" -.split(" "),V="__token__",$=[],J=et&&/\n|Opera/.test(et+Z.call(e.opera)),K=_.concat,Q=D.hasOwnProperty,G=_.push,Y=_.slice,Z=D.toString,et=R.test(et=Y.bind)&&et,tt=R.test(tt=Array.isArray)&&tt,nt=e.isFinite,rt=R.test(rt=Object.keys)&&rt,it="[object Array]",st="[object Boolean]",ot="[object Date]",ut="[object Function]",at="[object Number]",ft="[object RegExp]",lt="[object String]",ct=e.clearTimeout,ht=e.setTimeout,pt={"&":"&","<":"<",'"':""","'":"'"},dt={"boolean":i,"function":n,object +.split(" "),V="__token__",$=[],J=_.concat,K=D.hasOwnProperty,Q=_.push,G=_.slice,Y=D.toString,Z=R.test(Z=G.bind)&&Z,et=R.test(et=Array.isArray)&&et,tt=e.isFinite,nt=R.test(nt=Object.keys)&&nt,rt="[object Array]",it="[object Boolean]",st="[object Date]",ot="[object Function]",ut="[object Number]",at="[object RegExp]",ft="[object String]",lt=e.clearTimeout,ct=e.setTimeout,ht=Z&&/\n|Opera/.test(Z+Y.call(e.opera)),pt={"&":"&","<":"<",'"':""","'":"'"},dt={"boolean":i,"function":n,object :n,number:i,string:i,"undefined":i},vt={"\\":"\\","'":"'","\n":"n","\r":"r"," ":"t","\u2028":"u2028","\u2029":"u2029"};s.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:"obj"};var mt={a:"f,d,C",k:"f",q:"if(!d){d=k}else if(C)d=n(d,C)",j:"d(f[l],l,f)"},gt={k:"true",j:"if(!d(f[l],l,f))return!v"},yt={a:"r",k:"r",q:"for(var y,z=1,o=arguments.length;ze?t():function(){if(1>--e)return t.apply(this,arguments)}},s.bind=N,s.bindAll=function(e){var t=arguments,n=1;1==t.length&&(n=0,t=Pt(e));for(var r=t.length;nw(i,e[n],r)&&t.push(e[n]);return t},s.escape=function(e){return e==r?"":(e+"").replace(z,c)},s.every=Tt,s.extend=Dt,s.filter=R,s.find=Nt,s.first=y,s.flatten=b,s.forEach=Ct, -s.forIn=yt,s.forOwn=mt,s.functions=Pt,s.groupBy=kt,s.has=function(e,t){return Q.call(e,t)},s.identity=k,s.indexOf=w,s.initial=function(e,t,n){return e?Y.call(e,0,-(t==r||n?1:t)):[]},s.intersection=function(e){var t=[];if(!e)return t;for(var n,r=-1,i=e.length,s=Y.call(arguments,1);++rw(t,n)&&Tt(s,function(e){return-1n?Math.max(0,r+n):Math.min(n,r-1))+1);r--;)if(e[r]===t)return r;return-1 -},s.map=At,s.max=E,s.memoize=function(e,t){var n={};return function(){var r=t?t.apply(this,arguments):arguments[0];return Q.call(n,r)?n[r]:n[r]=e.apply(this,arguments)}},s.min=function(e,t,n){var r=Infinity,i=r;if(!e)return i;var s=-1,o=e.length;if(!t){for(;++s>>0?e.length:Bt(e).length},s.some=gt,s.sortBy=St,s.sortedIndex=x,s.tap=function(e,t){return t(e),e},s.template=function(e,t,n){n||(n={});var i,o,u,a=s.templateSettings,c=n.escape,h=n.evaluate,p=n.interpolate +,j:{b:"v[l]={a:d(f[l],l,f),b:f[l]}",n:"v.push({a:d(f[l],l,f),b:f[l]})"},e:"v.sort(g);o=v.length;while(o--){v[o]=v[o].b}"}),_t=u(yt,{j:"if(r[l]==null)"+yt.j}),Dt=u(yt),yt=u(mt,wt,Et,{r:i}),mt=u(mt,wt,Et),Pt=u({a:"r",k:"[]",r:i,j:"if(D.call(r[l])==i)v.push(l)",e:"v.sort()"});Ct({Arguments:"[object Arguments]",Date:st,Function:ot,Number:ut,RegExp:at,String:ft},function(e,t){s["is"+t]=function(t){return Y.call(t)==e}}),s.isArguments(arguments)||(s.isArguments=function(e){return!!e&&!!K.call(e,"callee" +)});var Ht=et||function(e){return Y.call(e)==rt},et=u({a:"E",k:"true",q:"var e=D.call(E);if(e==c||e==A)return!E.length",j:{n:"return false"}}),Bt=nt?function(e){return"function"==typeof e?xt(e):nt(e)}:xt,jt=u({a:"r",k:"[]",j:"v.push(r[l])"});s.VERSION="0.3.2",s.after=function(e,t){return 1>e?t():function(){if(1>--e)return t.apply(this,arguments)}},s.bind=N,s.bindAll=function(e){var t=arguments,n=1;1==t.length&&(n=0,t=Pt(e));for(var r=t.length;nw(i,e[n],r)&&t.push(e[n]);return t},s.escape=function(e){return e==r?"":(e+"").replace(z,c)},s.every=Tt,s.extend=Dt,s.filter=R,s.find=Nt,s.first=y,s.flatten=b,s.forEach=Ct, +s.forIn=yt,s.forOwn=mt,s.functions=Pt,s.groupBy=kt,s.has=function(e,t){return K.call(e,t)},s.identity=k,s.indexOf=w,s.initial=function(e,t,n){return e?G.call(e,0,-(t==r||n?1:t)):[]},s.intersection=function(e){var t=[];if(!e)return t;for(var n,r=-1,i=e.length,s=G.call(arguments,1);++rw(t,n)&&Tt(s,function(e){return-1n?Math.max(0,r+n):Math.min(n,r-1))+1);r--;)if(e[r]===t)return r;return-1 +},s.map=At,s.max=E,s.memoize=function(e,t){var n={};return function(){var r=t?t.apply(this,arguments):arguments[0];return K.call(n,r)?n[r]:n[r]=e.apply(this,arguments)}},s.min=function(e,t,n){var r=Infinity,i=r;if(!e)return i;var s=-1,o=e.length;if(!t){for(;++s>>0?e.length:Bt(e).length},s.some=gt,s.sortBy=St,s.sortedIndex=x,s.tap=function(e,t){return t(e),e},s.template=function(e,t,n){n||(n={});var i,o,u,a=s.templateSettings,c=n.escape,h=n.evaluate,p=n.interpolate ,n=n.variable;return c==r&&(c=a.escape),h==r&&(h=a.evaluate),p==r&&(p=a.interpolate),c&&(i=e!=(e=e.replace(c,d))),p&&(u=e!=(e=e.replace(p,m))),h&&(o=e!=(e=e.replace(h,v))),e="__p='"+e.replace(W,l).replace(U,f)+"';",$.length=0,u&&(e=e.replace(F,"__p+=")),o&&(e=e.replace(j,""),u&&(e=e.replace(I,"__t);"))),n||(n=a.variable,o||!n?e="with("+n+"||{}){"+e+"}":(n!=A&&(A=n,O=RegExp("([(\\s])("+n+"\\."+n+")\\b","g")),e=e.replace(q,"$&"+n+".").replace(O,"$1($2||"+n+")"))),e="function("+n+"){var __p"+(u?",__t" -:"")+(i?",__e=_.escape":"")+(o?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+e+"return __p}",i=Function("_","return "+e)(s),t?i(t):(i.source=e,i)},s.throttle=function(e,t){function n(){a=new Date,u=r,e.apply(o,i)}var i,s,o,u,a=0;return function(){var r=new Date,f=t-(r-a);return i=arguments,o=this,0>=f?(a=r,s=e.apply(o,i)):u||(u=ht(n,f)),s}},s.times=function(e,t,n){var r=-1;if(n)for(;++r>>0?Y.call(e):jt(e)},s.union=function(){for(var e=-1,t=[],n=K.apply(t,arguments),r=n.length;++ew(t,n[e])&&t.push(n[e]);return t},s.uniq=T,s.uniqueId=function(e){var t=H++;return e?e+t:t},s.values=jt,s.without=function(e){var t=[];if(!e)return t;for(var n=-1,r=e.length;++nw(arguments,e[n],1)&&t.push(e[n]);return t},s.wrap=function(e,t){return function(){var n=[e];return arguments.length&&G.apply(n,arguments +:"")+(i?",__e=_.escape":"")+(o?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+e+"return __p}",i=Function("_","return "+e)(s),t?i(t):(i.source=e,i)},s.throttle=function(e,t){function n(){a=new Date,u=r,e.apply(o,i)}var i,s,o,u,a=0;return function(){var r=new Date,f=t-(r-a);return i=arguments,o=this,0>=f?(a=r,s=e.apply(o,i)):u||(u=ct(n,f)),s}},s.times=function(e,t,n){var r=-1;if(n)for(;++r>>0?G.call(e):jt(e)},s.union=function(){for(var e=-1,t=[],n=J.apply(t,arguments),r=n.length;++ew(t,n[e])&&t.push(n[e]);return t},s.uniq=T,s.uniqueId=function(e){var t=H++;return e?e+t:t},s.values=jt,s.without=function(e){var t=[];if(!e)return t;for(var n=-1,r=e.length;++nw(arguments,e[n],1)&&t.push(e[n]);return t},s.wrap=function(e,t){return function(){var n=[e];return arguments.length&&Q.apply(n,arguments ),t.apply(this,n)}},s.zip=function(e){if(!e)return[];for(var t=-1,n=E(Ot(arguments,"length")),r=Array(n);++t