Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-10 10:57:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a different private indicator for _.merge now that isPlainObject is exposed.

Browse Source 
Former-commit-id: 5c75de935eb3e5e9e035bd6520398c7fbd811ea6
This commit is contained in:
John-David Dalton
2012-09-24 01:06:58 -07:00
parent d0c94c1aef
commit 2fb93bac99
4 changed files with 146 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lodash.min.js vendored
View File

@@ -5,8 +5,8 @@
;(function(e,t){function s(e){return new o(e)}function o(e){if(e&&e.__wrapped__)return e;this.__wrapped__=e}function u(e,t){return function(n,r,i){return e.call(t,n,r,i)}}function a(e,t,n){t||(t=0);var r=e.length,i=r-t>=(n||B),s=i?{}:e;if(i)for(var o=t-1;++o<r;)n=e[o]+"",(G.call(s,n)?s[n]:s[n]=[]).push(e[o]);return function(e){if(i){var n=e+"";return G.call(s,n)&&-1<T(s[n],e)}return-1<T(s,e,t)}}function f(e,n){var r=e.b,i=n.b,e=e.a,n=n.a;if(e!==n){if(e>n||e===t)return 1;if(e<n||n===t)return-1}return r<
i?-1:1}function l(e,t,n){function r(){var u=arguments,a=s?this:t;return i||(e=t[o]),n.length&&(u=u.length?n.concat(et.call(u)):n),this instanceof r?(d.prototype=e.prototype,a=new d,(u=e.apply(a,u))&&Bt[typeof u]?u:a):e.apply(a,u)}var i=g(e),s=!n,o=e;return s&&(n=t),r}function c(){for(var e,t,n,s=-1,o=arguments.length,a={e:"",f:"",j:"",q:"",c:{d:""},m:{d:""}};++s<o;)for(t in e=arguments[s],e)n=(n=e[t])==r?"":n,/d|i/.test(t)?("string"==typeof n&&(n={b:n,l:n}),a.c[t]=n.b||"",a.m[t]=n.l||""):a[t]=n;e=
a.a,t=/^[^,]+/.exec(e)[0],n=a.s,a.g=t,a.h=wt,a.k=Ot,a.n=xt,a.p=K,a.r=a.r!==i,a.s=n==r?Mt:n,a.o==r&&(a.o=Ct),a.f||(a.f="if(!"+t+")return u");if("e"!=t||!a.c.i)a.c=r;t="",a.s&&(t+="'use strict';"),t+="var j,B,k="+a.g+",u",a.j&&(t+="="+a.j),t+=";"+a.f+";"+a.q+";",a.c&&(t+="var l=k.length;j=-1;",a.m&&(t+="if(l===+l){"),a.o&&(t+="if(z.call(k)==x){k=k.split('')}"),t+=a.c.d+";while(++j<l){B=k[j];"+a.c.i+"}",a.m&&(t+="}"));if(a.m){a.c?t+="else{":a.n&&(t+="var l=k.length;j=-1;if(l&&P(k)){while(++j<l){B=k[j+=''];"+
a.m.i+"}}else{"),a.h||(t+="var v=typeof k=='function'&&r.call(k,'prototype');");if(a.k&&a.r)t+="var o=-1,p=Y[typeof k]?m(k):[],l=p.length;"+a.m.d+";while(++o<l){j=p[o];",a.h||(t+="if(!(v&&j=='prototype')){"),t+="B=k[j];"+a.m.i+"",a.h||(t+="}");else{t+=a.m.d+";for(j in k){";if(!a.h||a.r)t+="if(",a.h||(t+="!(v&&j=='prototype')"),!a.h&&a.r&&(t+="&&"),a.r&&(t+="h.call(k,j)"),t+="){";t+="B=k[j];"+a.m.i+";";if(!a.h||a.r)t+="}"}t+="}";if(a.h){t+="var g=k.constructor;";for(n=0;7>n;n++)t+="j='"+a.p[n]+"';if("
,"constructor"==a.p[n]&&(t+="!(g&&g.prototype===k)&&"),t+="h.call(k,j)){B=k[j];"+a.m.i+"}"}if(a.c||a.n)t+="}"}return t+=a.e+";return u",Function("E,F,G,c,J,f,K,h,i,N,P,R,T,U,X,Y,m,r,w,x,z,A","var H=function("+e+"){"+t+"};return H")(_t,D,A,u,f,Q,Yt,G,O,T,m,$t,g,Jt,vt,Bt,ot,Z,et,gt,tt)}function h(e){return"\\"+jt[e]}function p(e){return Pt[e]}function d(){}function v(e){return Ht[e]}function m(e){return tt.call(e)==lt}function g(e){return"function"==typeof e}function y(e,t){var n=i;if(!e||"object"!=typeof
a.m.i+"}}else{"),a.h||(t+="var v=typeof k=='function'&&r.call(k,'prototype');");if(a.k&&a.r)t+="var o=-1,p=Z[typeof k]?m(k):[],l=p.length;"+a.m.d+";while(++o<l){j=p[o];",a.h||(t+="if(!(v&&j=='prototype')){"),t+="B=k[j];"+a.m.i+"",a.h||(t+="}");else{t+=a.m.d+";for(j in k){";if(!a.h||a.r)t+="if(",a.h||(t+="!(v&&j=='prototype')"),!a.h&&a.r&&(t+="&&"),a.r&&(t+="h.call(k,j)"),t+="){";t+="B=k[j];"+a.m.i+";";if(!a.h||a.r)t+="}"}t+="}";if(a.h){t+="var g=k.constructor;";for(n=0;7>n;n++)t+="j='"+a.p[n]+"';if("
,"constructor"==a.p[n]&&(t+="!(g&&g.prototype===k)&&"),t+="h.call(k,j)){B=k[j];"+a.m.i+"}"}if(a.c||a.n)t+="}"}return t+=a.e+";return u",Function("E,F,G,c,J,f,K,h,i,N,P,R,T,U,X,Y,Z,m,r,w,x,z,A","var H=function("+e+"){"+t+"};return H")(_t,D,A,u,f,Q,Yt,G,O,T,m,$t,g,Jt,d,vt,Bt,ot,Z,et,gt,tt)}function h(e){return"\\"+jt[e]}function p(e){return Pt[e]}function d(){}function v(e){return Ht[e]}function m(e){return tt.call(e)==lt}function g(e){return"function"==typeof e}function y(e,t){var n=i;if(!e||"object"!=typeof
e||!t&&m(e))return n;var r=e.constructor;return(!kt||"function"==typeof e.toString||"string"!=typeof (e+""))&&(!g(r)||r instanceof r)?St?(Yt(e,function(e,t,r){return n=!G.call(r,t),i}),n===i):(Yt(e,function(e,t){n=t}),n===i||G.call(e,n)):n}function b(e,t,s,o,u){if(e==r)return e;s&&(t=i);if(s=Bt[typeof e]){var a=tt.call(e);if(!Dt[a]||Tt&&m(e))return e;var f=a==ct,s=f||(a==vt?Jt(e,n):s)}if(!s||!t)return s?f?et.call(e):Gt({},e):e;s=e.constructor;switch(a){case ht:return new s(e==n);case pt:return new
s(+e);case dt:case gt:return new s(e);case mt:return s(e.source,z.exec(e))}o||(o=[]),u||(u=[]);for(a=o.length;a--;)if(o[a]==e)return u[a];var l=f?s(a=e.length):{};o.push(e),u.push(l);if(f)for(f=-1;++f<a;)l[f]=b(e[f],t,r,o,u);else Zt(e,function(e,n){l[n]=b(e,t,r,o,u)});return l}function w(e,t,s,o){if(e==r||t==r)return e===t;if(e===t)return 0!==e||1/e==1/t;if(Bt[typeof e]||Bt[typeof t])e=e.__wrapped__||e,t=t.__wrapped__||t;var u=tt.call(e);if(u!=tt.call(t))return i;switch(u){case ht:case pt:return+
e==+t;case dt:return e!=+e?t!=+t:0==e?1/e==1/t:e==+t;case mt:case gt:return e==t+""}var a=_t[u];if(Tt&&!a&&(a=m(e))&&!m(t)||!a&&(u!=vt||kt&&("function"!=typeof e.toString&&"string"==typeof (e+"")||"function"!=typeof t.toString&&"string"==typeof (t+""))))return i;s||(s=[]),o||(o=[]);for(u=s.length;u--;)if(s[u]==e)return o[u]==t;var u=-1,f=n,l=0;s.push(e),o.push(t);if(a){l=e.length;if(f=l==t.length)for(;l--&&(f=w(e[l],t[l],s,o)););return f}a=e.constructor,f=t.constructor;if(a!=f&&(!g(a)||!(a instanceof
@@ -18,12 +18,12 @@ arguments.length?nt.call.apply(nt,arguments):l(e,t,et.call(arguments,2))}functio
P.toString,nt=X.test(nt=et.bind)&&nt,rt=Math.floor,it=X.test(it=Array.isArray)&&it,st=e.isFinite,ot=X.test(ot=Object.keys)&&ot,ut=Math.max,at=Math.min,ft=Math.random,lt="[object Arguments]",ct="[object Array]",ht="[object Boolean]",pt="[object Date]",dt="[object Number]",vt="[object Object]",mt="[object RegExp]",gt="[object String]",yt=e.clearTimeout,bt=e.setTimeout,wt,Et,St,xt=n;(function(){function e(){this.x=1}var t={0:1,length:1},n=[];e.prototype={valueOf:1,y:1};for(var r in new e)n.push(r);for(r in
arguments)xt=!r;wt=4>(n+"").length,St="x"!=n[0],Et=(n.splice.call(t,0,1),t[0])})(1);var Tt=!m(arguments),Nt="x"!=et.call("x")[0],Ct="xx"!="x"[0]+Object("x")[0];try{var kt=("[object Object]",tt.call(e.document||0)==vt)}catch(Lt){}var At=nt&&/\n|Opera/.test(nt+tt.call(e.opera)),Ot=ot&&/^.+$|true/.test(ot+!!e.attachEvent),Mt=!At,_t={};_t[ht]=_t[pt]=_t["[object Function]"]=_t[dt]=_t[vt]=_t[mt]=i,_t[lt]=_t[ct]=_t[gt]=n;var Dt={};Dt[lt]=Dt["[object Function]"]=i,Dt[ct]=Dt[ht]=Dt[pt]=Dt[dt]=Dt[vt]=Dt[mt
]=Dt[gt]=n;var Pt={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;"},Ht={"&amp;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#x27;":"'"},Bt={"boolean":i,"function":n,object:n,number:i,string:i,"undefined":i,unknown:n},jt={"\\":"\\","'":"'","\n":"n","\r":"r"," ":"t","\u2028":"u2028","\u2029":"u2029"};s.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""};var Ft={a:"e,d,y",j:"e",q:"if(!d)d=i;else if(y!==A)d=c(d,y)",i:"if(d(B,j,e)===false)return u"
},It={j:"{}",q:"var q;if(typeof d!='function'){var ii=d;d=function(B){return B[ii]}}else if(y!==A)d=c(d,y)",i:"q=d(B,j,e);(h.call(u,q)?u[q]++:u[q]=1)"},qt={j:"true",i:"if(!d(B,j,e))return!u"},Rt={r:i,s:i,a:"n",j:"n",q:"for(var a=1,b=arguments.length;a<b;a++){if(k=arguments[a]){",i:"u[j]=B",e:"}}"},Ut={j:"[]",i:"d(B,j,e)&&u.push(B)"},zt={q:"if(y!==A)d=c(d,y)"},Wt={i:{l:Ft.i}},Xt={j:"",f:"if(!e)return[]",d:{b:"u=Array(l)",l:"u="+(Ot?"Array(l)":"[]")},i:{b:"u[j]=d(B,j,e)",l:"u"+(Ot?"[o]=":".push")+"(d(B,j,e))"
},It={j:"{}",q:"var q;if(typeof d!='function'){var jj=d;d=function(B){return B[jj]}}else if(y!==A)d=c(d,y)",i:"q=d(B,j,e);(h.call(u,q)?u[q]++:u[q]=1)"},qt={j:"true",i:"if(!d(B,j,e))return!u"},Rt={r:i,s:i,a:"n",j:"n",q:"for(var a=1,b=arguments.length;a<b;a++){if(k=arguments[a]){",i:"u[j]=B",e:"}}"},Ut={j:"[]",i:"d(B,j,e)&&u.push(B)"},zt={q:"if(y!==A)d=c(d,y)"},Wt={i:{l:Ft.i}},Xt={j:"",f:"if(!e)return[]",d:{b:"u=Array(l)",l:"u="+(Ot?"Array(l)":"[]")},i:{b:"u[j]=d(B,j,e)",l:"u"+(Ot?"[o]=":".push")+"(d(B,j,e))"
}},Vt={r:i,a:"n,d,y",j:"{}",q:"var S=typeof d=='function';if(!S){var t=f.apply(F,arguments)}else if(y!==A)d=c(d,y)",i:"if(S?!d(B,j,n):N(t,j)<0)u[j]=B"};Tt&&(m=function(e){return!!e&&!!G.call(e,"callee")});var $t=it||function(e){return tt.call(e)==ct};g(/x/)&&(g=function(e){return"[object Function]"==tt.call(e)});var Jt=Bt.__proto__!=P?y:function(e,t){if(!e)return i;var n=e.valueOf,r="function"==typeof n&&(r=n.__proto__)&&r.__proto__;return r?e==r||e.__proto__==r&&(t||!m(e)):y(e)},Kt=c({a:"n",j:"[]"
,i:"u.push(j)"}),Qt=c(Rt,{i:"if(u[j]==null)"+Rt.i}),Gt=c(Rt),Yt=c(Ft,zt,Wt,{r:i}),Zt=c(Ft,zt,Wt),en=c({r:i,a:"n",j:"[]",i:"if(T(B))u.push(j)",e:"u.sort()"}),tn=c({a:"n",j:"{}",i:"u[B]=j"}),nn=c({a:"B",j:"true",q:"var I=z.call(B),l=B.length;if(E[I]"+(Tt?"||P(B)":"")+"||(I==X&&l===+l&&T(B.splice)))return!l",i:{l:"return false"}}),rn=ot?function(e){var t=typeof e;return"function"==t&&Z.call(e,"prototype")?Kt(e):e&&Bt[t]?ot(e):[]}:Kt,sn=c(Rt,{a:"n,dd,O",q:"var b,Q,ee,ff,D=arguments,a=0;if(O==U){b=2;ee=D[3];ff=D[4]}else{b=D.length;ee=[];ff=[]}while(++a<b){if(k=D[a]){"
,i:"if((dd=B)&&((Q=R(dd))||U(dd))){var L=false,gg=ee.length;while(gg--)if(L=ee[gg]==dd)break;if(L){u[j]=ff[gg]}else{ee.push(dd);ff.push(B=(B=u[j])&&Q?(R(B)?B:[]):(U(B)?B:{}));u[j]=H(B,dd,U,ee,ff)}}else if(dd!=null)u[j]=dd"}),on=c(Vt),un=c({a:"n",j:"[]",i:"u"+(Ot?"[o]=":".push")+"([j,B])"}),an=c(Vt,{q:"if(typeof d!='function'){var q,t=f.apply(F,arguments),l=t.length;for(j=1;j<l;j++){q=t[j];if(q in n)u[q]=n[q]}}else{if(y!==A)d=c(d,y)",i:"if(d(B,j,n))u[j]=B",e:"}"}),fn=c({a:"n",j:"[]",i:"u.push(B)"}
),ln=c({a:"e,hh",j:"false",o:i,d:{b:"if(z.call(e)==x)return e.indexOf(hh)>-1"},i:"if(B===hh)return true"}),cn=c(Ft,It),hn=c(Ft,qt),pn=c(Ft,Ut),dn=c(Ft,zt,{j:"",i:"if(d(B,j,e))return B"}),vn=c(Ft,zt),mn=c(Ft,It,{i:"q=d(B,j,e);(h.call(u,q)?u[q]:u[q]=[]).push(B)"}),gn=c(Xt,{a:"e,V",q:"var D=w.call(arguments,2),S=typeof V=='function'",i:{b:"u[j]=(S?V:B[V]).apply(B,D)",l:"u"+(Ot?"[o]=":".push")+"((S?V:B[V]).apply(B,D))"}}),yn=c(Ft,Xt),bn=c(Xt,{a:"e,bb",i:{b:"u[j]=B[bb]",l:"u"+(Ot?"[o]=":".push")+"(B[bb])"
}}),wn=c({a:"e,d,C,y",j:"C",q:"var W=arguments.length<3;if(y!==A)d=c(d,y)",d:{b:"if(W)u=k[++j]"},i:{b:"u=d(u,B,j,e)",l:"u=W?(W=false,B):d(u,B,j,e)"}}),En=c(Ft,Ut,{i:"!"+Ut.i}),Sn=c(Ft,qt,{j:"false",i:qt.i.replace("!","")}),xn=c(Ft,It,Xt,{i:{b:"u[j]={a:d(B,j,e),b:j,c:B}",l:"u"+(Ot?"[o]=":".push")+"({a:d(B,j,e),b:j,c:B})"},e:"u.sort(J);l=u.length;while(l--)u[l]=u[l].c"}),Tn=c(Ut,{a:"e,aa",q:"var t=[];K(aa,function(B,q){t.push(q)});var cc=t.length",i:"for(var q,Z=true,s=0;s<cc;s++){q=t[s];if(!(Z=B[q]===aa[q]))break}Z&&u.push(B)"
,i:"u.push(j)"}),Qt=c(Rt,{i:"if(u[j]==null)"+Rt.i}),Gt=c(Rt),Yt=c(Ft,zt,Wt,{r:i}),Zt=c(Ft,zt,Wt),en=c({r:i,a:"n",j:"[]",i:"if(T(B))u.push(j)",e:"u.sort()"}),tn=c({a:"n",j:"{}",i:"u[B]=j"}),nn=c({a:"B",j:"true",q:"var I=z.call(B),l=B.length;if(E[I]"+(Tt?"||P(B)":"")+"||(I==Y&&l===+l&&T(B.splice)))return!l",i:{l:"return false"}}),rn=ot?function(e){var t=typeof e;return"function"==t&&Z.call(e,"prototype")?Kt(e):e&&Bt[t]?ot(e):[]}:Kt,sn=c(Rt,{a:"n,ee,O",q:"var b,Q,ff,gg,D=arguments,a=0;if(O==X){b=2;ff=D[3];gg=D[4]}else{b=D.length;ff=[];gg=[]}while(++a<b){if(k=D[a]){"
,i:"if((ee=B)&&((Q=R(ee))||U(ee))){var L=false,hh=ff.length;while(hh--)if(L=ff[hh]==ee)break;if(L){u[j]=gg[hh]}else{ff.push(ee);gg.push(B=(B=u[j])&&Q?(R(B)?B:[]):(U(B)?B:{}));u[j]=H(B,ee,X,ff,gg)}}else if(ee!=null)u[j]=ee"}),on=c(Vt),un=c({a:"n",j:"[]",i:"u"+(Ot?"[o]=":".push")+"([j,B])"}),an=c(Vt,{q:"if(typeof d!='function'){var q,t=f.apply(F,arguments),l=t.length;for(j=1;j<l;j++){q=t[j];if(q in n)u[q]=n[q]}}else{if(y!==A)d=c(d,y)",i:"if(d(B,j,n))u[j]=B",e:"}"}),fn=c({a:"n",j:"[]",i:"u.push(B)"}
),ln=c({a:"e,ii",j:"false",o:i,d:{b:"if(z.call(e)==x)return e.indexOf(ii)>-1"},i:"if(B===ii)return true"}),cn=c(Ft,It),hn=c(Ft,qt),pn=c(Ft,Ut),dn=c(Ft,zt,{j:"",i:"if(d(B,j,e))return B"}),vn=c(Ft,zt),mn=c(Ft,It,{i:"q=d(B,j,e);(h.call(u,q)?u[q]:u[q]=[]).push(B)"}),gn=c(Xt,{a:"e,V",q:"var D=w.call(arguments,2),S=typeof V=='function'",i:{b:"u[j]=(S?V:B[V]).apply(B,D)",l:"u"+(Ot?"[o]=":".push")+"((S?V:B[V]).apply(B,D))"}}),yn=c(Ft,Xt),bn=c(Xt,{a:"e,cc",i:{b:"u[j]=B[cc]",l:"u"+(Ot?"[o]=":".push")+"(B[cc])"
}}),wn=c({a:"e,d,C,y",j:"C",q:"var W=arguments.length<3;if(y!==A)d=c(d,y)",d:{b:"if(W)u=k[++j]"},i:{b:"u=d(u,B,j,e)",l:"u=W?(W=false,B):d(u,B,j,e)"}}),En=c(Ft,Ut,{i:"!"+Ut.i}),Sn=c(Ft,qt,{j:"false",i:qt.i.replace("!","")}),xn=c(Ft,It,Xt,{i:{b:"u[j]={a:d(B,j,e),b:j,c:B}",l:"u"+(Ot?"[o]=":".push")+"({a:d(B,j,e),b:j,c:B})"},e:"u.sort(J);l=u.length;while(l--)u[l]=u[l].c"}),Tn=c(Ut,{a:"e,bb",q:"var t=[];K(bb,function(B,q){t.push(q)});var dd=t.length",i:"for(var q,aa=true,s=0;s<dd;s++){q=t[s];if(!(aa=B[q]===bb[q]))break}aa&&u.push(B)"
}),Nn=c({r:i,s:i,a:"n",j:"n",q:"var M=arguments,l=M.length;if(l>1){for(var j=1;j<l;j++)u[M[j]]=G(u[M[j]],u);return u}",i:"if(T(u[j]))u[j]=G(u[j],u)"});s.VERSION="0.7.0",s.after=function(e,t){return 1>e?t():function(){if(1>--e)return t.apply(this,arguments)}},s.bind=A,s.bindAll=Nn,s.chain=function(e){return e=new o(e),e.__chain__=n,e},s.clone=b,s.compact=function(e){var t=[];if(!e)return t;for(var n=-1,r=e.length;++n<r;)e[n]&&t.push(e[n]);return t},s.compose=function(){var e=arguments;return function(
){for(var t=arguments,n=e.length;n--;)t=[e[n].apply(this,t)];return t[0]}},s.contains=ln,s.countBy=cn,s.debounce=function(e,t,n){function i(){a=r,n||(o=e.apply(u,s))}var s,o,u,a;return function(){var r=n&&!a;return s=arguments,u=this,yt(a),a=bt(i,t),r&&(o=e.apply(u,s)),o}},s.defaults=Qt,s.defer=function(e){var n=et.call(arguments,1);return bt(function(){return e.apply(t,n)},1)},s.delay=function(e,n){var r=et.call(arguments,2);return bt(function(){return e.apply(t,r)},n)},s.difference=function(e){
var t=[];if(!e)return t;for(var n=-1,r=e.length,i=Q.apply(D,arguments),i=a(i,r);++n<r;)i(e[n])||t.push(e[n]);return t},s.escape=function(e){return e==r?"":(e+"").replace($,p)},s.every=hn,s.extend=Gt,s.filter=pn,s.find=dn,s.first=S,s.flatten=x,s.forEach=vn,s.forIn=Yt,s.forOwn=Zt,s.functions=en,s.groupBy=mn,s.has=function(e,t){return e?G.call(e,t):i},s.identity=O,s.indexOf=T,s.initial=function(e,t,n){return e?et.call(e,0,-(t==r||n?1:t)):[]},s.intersection=function(e){var t=[];if(!e)return t;var n,r=