diff --git a/build.js b/build.js index b66559f63..fbbced105 100755 --- a/build.js +++ b/build.js @@ -1916,6 +1916,7 @@ if (isMobile) { source = replaceSupportProp(source, 'enumPrototypes', 'true'); source = replaceSupportProp(source, 'nonEnumArgs', 'true'); + source = removeIsArrayFallback(source); } else { source = removeIsFunctionFallback(source); @@ -1938,7 +1939,6 @@ source = removeSupportNodeClass(source); if (!isMobile) { - source = removeIsArrayFallback(source); source = removeSupportEnumPrototypes(source); source = removeSupportNonEnumArgs(source); @@ -2187,13 +2187,6 @@ '}' ].join('\n')); - // replace `_.isArray` - source = replaceFunction(source, 'isArray', [ - 'var isArray = nativeIsArray || function(value) {', - ' return toString.call(value) == arrayClass;', - '};' - ].join('\n')); - // replace `_.isEmpty` source = replaceFunction(source, 'isEmpty', [ 'function isEmpty(value) {', diff --git a/dist/lodash.compat.js b/dist/lodash.compat.js index 9c5368f52..aea00d213 100644 --- a/dist/lodash.compat.js +++ b/dist/lodash.compat.js @@ -951,7 +951,7 @@ * // => true */ var isArray = nativeIsArray || function(value) { - return value && typeof value == 'object' && toString.call(value) == arrayClass; + return value ? (typeof value == 'object' && toString.call(value) == arrayClass) : false; }; /** @@ -1457,7 +1457,7 @@ * // => true */ function isDate(value) { - return value ? typeof value == 'object' && toString.call(value) == dateClass : false; + return value ? (typeof value == 'object' && toString.call(value) == dateClass) : false; } /** @@ -1911,7 +1911,7 @@ * // => true */ function isRegExp(value) { - return value ? typeof value == 'object' && toString.call(value) == regexpClass : false; + return value ? (typeof value == 'object' && toString.call(value) == regexpClass) : false; } /** diff --git a/dist/lodash.compat.min.js b/dist/lodash.compat.min.js index 95135b138..5164e89d7 100644 --- a/dist/lodash.compat.min.js +++ b/dist/lodash.compat.min.js @@ -24,7 +24,7 @@ t?u[a]=t[e]:u[a[0]]=a[1]}return u}function kt(n,t){return se.fastBind||Zt&&2/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:h,variable:"",imports:{_:a}};var ve={a:"q,w,g",h:"var a=arguments,b=0,c=typeof g=='number'?2:a.length;while(++b":">",'"':""","'":"'"},we=Y(_e),Ce=z(ve,{h:ve.h.replace(";",";if(c>3&&typeof a[c-2]=='function'){var d=p.createCallback(a[--c-1],a[c--],2);}else if(c>2&&typeof a[c-1]=='function'){d=a[--c];}"),f:"u[i]=d?d(u[i],m[i]):m[i]"}),je=z(ve),ke=z(ge,ye,{i:!1}),xe=z(ge,ye); +U.prototype=a.prototype,se.argsClass||(Q=function(n){return n?Jt.call(n,"callee"):!1});var he=ne||function(n){return n?typeof n=="object"&&Yt.call(n)==k:!1},me=z({a:"q",e:"[]",h:"if(!(r[typeof q]))return u",f:"u.push(i)",b:!1}),de=re?function(n){return tt(n)?se.enumPrototypes&&typeof n=="function"||se.nonEnumArgs&&n.length&&Q(n)?me(n):re(n):[]}:me,be=z(ge),_e={"&":"&","<":"<",">":">",'"':""","'":"'"},we=Y(_e),Ce=z(ve,{h:ve.h.replace(";",";if(c>3&&typeof a[c-2]=='function'){var d=p.createCallback(a[--c-1],a[c--],2);}else if(c>2&&typeof a[c-1]=='function'){d=a[--c];}"),f:"u[i]=d?d(u[i],m[i]):m[i]"}),je=z(ve),ke=z(ge,ye,{i:!1}),xe=z(ge,ye); nt(/x/)&&(nt=function(n){return typeof n=="function"&&Yt.call(n)==E});var Oe=Ht?function(n){if(!n||Yt.call(n)!=A||!se.argsClass&&Q(n))return!1;var t=n.valueOf,e=typeof t=="function"&&(e=Ht(t))&&Ht(e);return e?n==e||Ht(n)==e:G(n)}:G;ce&&u&&typeof Wt=="function"&&(xt=kt(Wt,r));var Ee=8==oe("08")?oe:function(n,t){return oe(rt(n)?n.replace(m,""):n,t||0)};return a.after=function(n,t){return 1>n?t():function(){return 1>--n?t.apply(this,arguments):void 0}},a.assign=Ce,a.at=function(n){var t=-1,e=Vt.apply(Dt,fe.call(arguments,1)),r=e.length,u=At(r); for(se.unindexedChars&&rt(n)&&(n=n.split(""));++t true */ - var isArray = nativeIsArray; + var isArray = nativeIsArray || function(value) { + return value ? (typeof value == 'object' && toString.call(value) == arrayClass) : false; + }; /** * A fallback implementation of `Object.keys` which produces an array of the @@ -1197,7 +1199,7 @@ * // => true */ function isDate(value) { - return value ? typeof value == 'object' && toString.call(value) == dateClass : false; + return value ? (typeof value == 'object' && toString.call(value) == dateClass) : false; } /** @@ -1644,7 +1646,7 @@ * // => true */ function isRegExp(value) { - return value ? typeof value == 'object' && toString.call(value) == regexpClass : false; + return value ? (typeof value == 'object' && toString.call(value) == regexpClass) : false; } /** diff --git a/dist/lodash.min.js b/dist/lodash.min.js index 727945e9a..59edcc2a7 100644 --- a/dist/lodash.min.js +++ b/dist/lodash.min.js @@ -22,21 +22,21 @@ if(typeof t!="number"&&t!=u){var o=-1;for(t=M.createCallback(t,e);++o>>1,e(n[r])=s;if(l)var v={};for(e!=u&&(c=[],e=M.createCallback(e,r));++oCt(c,g))&&((e||l)&&c.push(g),f.push(r))}return f}function It(n,t){for(var e=-1,r=n?n.length:0,u={};++e/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:d,variable:"",imports:{_:M}},Q.prototype=M.prototype;var he=ae,me=fe?function(n){return at(n)?fe(n):[]}:K,be={"&":"&","<":"<",">":">",'"':""","'":"'"},de=et(be);return Dt&&i&&typeof te=="function"&&(St=Nt(te,o)),Rt=8==pe("08")?pe:function(n,t){return pe(it(n)?n.replace(_,""):n,t||0)},M.after=function(n,t){return 1>n?t():function(){return 1>--n?t.apply(this,arguments):void 0 -}},M.assign=P,M.at=function(n){for(var t=-1,e=Wt.apply(Vt,ve.call(arguments,1)),r=e.length,u=Ft(r);++t=s,i=[],f=i;n:for(;++uCt(f,c)){o&&f.push(c); -for(var v=e;--v;)if(!(r[v]||(r[v]=U(t[v])))(c))continue n;i.push(c)}}return i},M.invert=et,M.invoke=function(n,t){var e=ve.call(arguments,2),r=-1,u=typeof t=="function",a=n?n.length:0,o=Ft(typeof a=="number"?a:0);return gt(n,function(n){o[++r]=(u?t:n[t]).apply(n,e)}),o},M.keys=me,M.map=yt,M.max=ht,M.memoize=function(n,t){var e={};return function(){var r=p+(t?t.apply(this,arguments):arguments[0]);return Zt.call(e,r)?e[r]:e[r]=n.apply(this,arguments)}},M.merge=ft,M.min=function(n,t,e){var r=1/0,u=r; -if(!t&&he(n)){e=-1;for(var a=n.length;++eCt(a,e))&&(u[e]=n)}),u},M.once=function(n){var t,e;return function(){return t?e:(t=r,e=n.apply(this,arguments),n=u,e)}},M.pairs=function(n){for(var t=-1,e=me(n),r=e.length,u=Ft(r);++te?ce(0,r+e):le(e,r-1))+1);r--;)if(n[r]===t)return r;return-1},M.mixin=$t,M.noConflict=function(){return o._=Ht,this},M.parseInt=Rt,M.random=function(n,t){return n==u&&t==u&&(t=1),n=+n||0,t==u&&(t=n,n=0),n+Xt(se()*((+t||0)-n+1))},M.reduce=bt,M.reduceRight=dt,M.result=function(n,t){var r=n?n[t]:e;return ut(r)?n[t]():r},M.runInContext=t,M.size=function(n){var t=n?n.length:0; -return typeof t=="number"?t:me(n).length},M.some=_t,M.sortedIndex=Ot,M.template=function(n,t,u){var a=M.templateSettings;n||(n=""),u=z({},u,a);var o,i=z({},u.imports,a.imports),a=me(i),i=ct(i),f=0,c=u.interpolate||k,l="__p+='",c=Kt((u.escape||k).source+"|"+c.source+"|"+(c===d?m:k).source+"|"+(u.evaluate||k).source+"|$","g");n.replace(c,function(t,e,u,a,i,c){return u||(u=a),l+=n.slice(f,c).replace(j,J),e&&(l+="'+__e("+e+")+'"),i&&(o=r,l+="';"+i+";__p+='"),u&&(l+="'+((__t=("+u+"))==null?'':__t)+'"),f=c+t.length,t +ge[O]=Ft,ge[E]=Rt,ge[I]=Tt,ge[S]=Pt,ge[N]=zt,ge[A]=Kt,ge[$]=Mt;var ye=M.support={};ye.fastBind=ue&&!Dt,M.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:d,variable:"",imports:{_:M}},Q.prototype=M.prototype;var he=ae||function(n){return n?typeof n=="object"&&re.call(n)==O:a},me=fe?function(n){return at(n)?fe(n):[]}:K,be={"&":"&","<":"<",">":">",'"':""","'":"'"},de=et(be);return Dt&&i&&typeof te=="function"&&(St=Nt(te,o)),Rt=8==pe("08")?pe:function(n,t){return pe(it(n)?n.replace(_,""):n,t||0) +},M.after=function(n,t){return 1>n?t():function(){return 1>--n?t.apply(this,arguments):void 0}},M.assign=P,M.at=function(n){for(var t=-1,e=Wt.apply(Vt,ve.call(arguments,1)),r=e.length,u=Ft(r);++t=s,i=[],f=i; +n:for(;++uCt(f,c)){o&&f.push(c);for(var v=e;--v;)if(!(r[v]||(r[v]=U(t[v])))(c))continue n;i.push(c)}}return i},M.invert=et,M.invoke=function(n,t){var e=ve.call(arguments,2),r=-1,u=typeof t=="function",a=n?n.length:0,o=Ft(typeof a=="number"?a:0);return gt(n,function(n){o[++r]=(u?t:n[t]).apply(n,e)}),o},M.keys=me,M.map=yt,M.max=ht,M.memoize=function(n,t){var e={};return function(){var r=p+(t?t.apply(this,arguments):arguments[0]); +return Zt.call(e,r)?e[r]:e[r]=n.apply(this,arguments)}},M.merge=ft,M.min=function(n,t,e){var r=1/0,u=r;if(!t&&he(n)){e=-1;for(var a=n.length;++eCt(a,e))&&(u[e]=n)}),u},M.once=function(n){var t,e;return function(){return t?e:(t=r,e=n.apply(this,arguments),n=u,e) +}},M.pairs=function(n){for(var t=-1,e=me(n),r=e.length,u=Ft(r);++te?ce(0,r+e):le(e,r-1))+1);r--;)if(n[r]===t)return r;return-1},M.mixin=$t,M.noConflict=function(){return o._=Ht,this},M.parseInt=Rt,M.random=function(n,t){return n==u&&t==u&&(t=1),n=+n||0,t==u&&(t=n,n=0),n+Xt(se()*((+t||0)-n+1)) +},M.reduce=bt,M.reduceRight=dt,M.result=function(n,t){var r=n?n[t]:e;return ut(r)?n[t]():r},M.runInContext=t,M.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:me(n).length},M.some=_t,M.sortedIndex=Ot,M.template=function(n,t,u){var a=M.templateSettings;n||(n=""),u=z({},u,a);var o,i=z({},u.imports,a.imports),a=me(i),i=ct(i),f=0,c=u.interpolate||k,l="__p+='",c=Kt((u.escape||k).source+"|"+c.source+"|"+(c===d?m:k).source+"|"+(u.evaluate||k).source+"|$","g");n.replace(c,function(t,e,u,a,i,c){return u||(u=a),l+=n.slice(f,c).replace(j,J),e&&(l+="'+__e("+e+")+'"),i&&(o=r,l+="';"+i+";__p+='"),u&&(l+="'+((__t=("+u+"))==null?'':__t)+'"),f=c+t.length,t }),l+="';\n",c=u=u.variable,c||(u="obj",l="with("+u+"){"+l+"}"),l=(o?l.replace(v,""):l).replace(g,"$1").replace(y,"$1;"),l="function("+u+"){"+(c?"":u+"||("+u+"={});")+"var __t,__p='',__e=_.escape"+(o?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+l+"return __p}";try{var p=qt(a,"return "+l).apply(e,i)}catch(s){throw s.source=l,s}return t?p(t):(p.source=l,p)},M.unescape=function(n){return n==u?"":Mt(n).replace(h,Z)},M.uniqueId=function(n){var t=++c;return Mt(n==u?"":n)+t },M.all=pt,M.any=_t,M.detect=vt,M.foldl=bt,M.foldr=dt,M.include=lt,M.inject=bt,q(M,function(n,t){M.prototype[t]||(M.prototype[t]=function(){var t=[this.__wrapped__];return ne.apply(t,arguments),n.apply(M,t)})}),M.first=wt,M.last=function(n,t,e){if(n){var r=0,a=n.length;if(typeof t!="number"&&t!=u){var o=a;for(t=M.createCallback(t,e);o--&&t(n[o],o,n);)r++}else if(r=t,r==u||e)return n[a-1];return Y(n,ce(0,a-r))}},M.take=wt,M.head=wt,q(M,function(n,t){M.prototype[t]||(M.prototype[t]=function(t,e){var r=n(this.__wrapped__,t,e); return t==u||e&&typeof t!="function"?r:new Q(r)})}),M.VERSION="1.2.0",M.prototype.toString=function(){return Mt(this.__wrapped__)},M.prototype.value=Bt,M.prototype.valueOf=Bt,gt(["join","pop","shift"],function(n){var t=Vt[n];M.prototype[n]=function(){return t.apply(this.__wrapped__,arguments)}}),gt(["push","reverse","sort","unshift"],function(n){var t=Vt[n];M.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),gt(["concat","slice","splice"],function(n){var t=Vt[n];M.prototype[n]=function(){return new Q(t.apply(this.__wrapped__,arguments)) diff --git a/dist/lodash.underscore.js b/dist/lodash.underscore.js index 1e3d0d096..db186cd13 100644 --- a/dist/lodash.underscore.js +++ b/dist/lodash.underscore.js @@ -500,7 +500,7 @@ * // => true */ var isArray = nativeIsArray || function(value) { - return toString.call(value) == arrayClass; + return value ? (typeof value == 'object' && toString.call(value) == arrayClass) : false; }; /** @@ -871,7 +871,7 @@ * // => true */ function isDate(value) { - return value ? typeof value == 'object' && toString.call(value) == dateClass : false; + return value ? (typeof value == 'object' && toString.call(value) == dateClass) : false; } /** @@ -1230,7 +1230,7 @@ * // => true */ function isRegExp(value) { - return value ? typeof value == 'object' && toString.call(value) == regexpClass : false; + return value ? (typeof value == 'object' && toString.call(value) == regexpClass) : false; } /** diff --git a/dist/lodash.underscore.min.js b/dist/lodash.underscore.min.js index 013b86b23..ca22d9979 100644 --- a/dist/lodash.underscore.min.js +++ b/dist/lodash.underscore.min.js @@ -17,8 +17,8 @@ t=P(t,r),r=-1;var u=n?n.length:0;if(typeof u=="number")for(;++rT(a,f))&&(r&&a.push(f),i.push(e))}return i}function C(n,t){return qt.fastBind||jt&&2"']/g,Z=/['\n\r\t\u2028\u2029\\]/g,nt="[object Arguments]",tt="[object Array]",rt="[object Boolean]",et="[object Date]",ut="[object Number]",ot="[object Object]",it="[object RegExp]",at="[object String]",ft={"boolean":!1,"function":!0,object:!0,number:!1,string:!1,undefined:!1},ct={"\\":"\\","'":"'","\n":"n","\r":"r"," ":"t","\u2028":"u2028","\u2029":"u2029"},lt=[],H={},pt=n._,st=RegExp("^"+(H.valueOf+"").replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/valueOf|for [^\]]+/g,".+?")+"$"),vt=Math.ceil,gt=n.clearTimeout,ht=lt.concat,yt=Math.floor,mt=H.hasOwnProperty,_t=lt.push,bt=n.setTimeout,dt=H.toString,jt=st.test(jt=dt.bind)&&jt,wt=st.test(wt=Array.isArray)&&wt,At=n.isFinite,xt=n.isNaN,Ot=st.test(Ot=Object.keys)&&Ot,Et=Math.max,St=Math.min,Nt=Math.random,Bt=lt.slice,H=st.test(n.attachEvent),kt=jt&&!/\n|true/.test(jt+H),qt={}; -(function(){var n={0:1,length:1};qt.argsObject=arguments.constructor==Object&&!(arguments instanceof Array),qt.fastBind=jt&&!kt,qt.spliceObjects=(lt.splice.call(n,0,1),!n[0])})(1),t.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},i.prototype=t.prototype,c(arguments)||(c=function(n){return n?mt.call(n,"callee"):!1});var Ft=wt||function(n){return dt.call(n)==tt},wt=function(n){var t,r=[];if(!n||!ft[typeof n])return r;for(t in n)mt.call(n,t)&&r.push(t); -return r},Rt=Ot?function(n){return m(n)?Ot(n):[]}:wt,Dt={"&":"&","<":"<",">":">",'"':""","'":"'"},Mt=v(Dt),Tt=function(n,t){var r;if(!n||!ft[typeof n])return n;for(r in n)if(t(n[r],r,n)===K)break;return n},$t=function(n,t){var r;if(!n||!ft[typeof n])return n;for(r in n)if(mt.call(n,r)&&t(n[r],r,n)===K)break;return n};y(/x/)&&(y=function(n){return typeof n=="function"&&"[object Function]"==dt.call(n)}),t.after=function(n,t){return 1>n?t():function(){return 1>--n?t.apply(this,arguments):void 0 +(function(){var n={0:1,length:1};qt.argsObject=arguments.constructor==Object&&!(arguments instanceof Array),qt.fastBind=jt&&!kt,qt.spliceObjects=(lt.splice.call(n,0,1),!n[0])})(1),t.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},i.prototype=t.prototype,c(arguments)||(c=function(n){return n?mt.call(n,"callee"):!1});var Ft=wt||function(n){return n?typeof n=="object"&&dt.call(n)==tt:!1},wt=function(n){var t,r=[];if(!n||!ft[typeof n])return r; +for(t in n)mt.call(n,t)&&r.push(t);return r},Rt=Ot?function(n){return m(n)?Ot(n):[]}:wt,Dt={"&":"&","<":"<",">":">",'"':""","'":"'"},Mt=v(Dt),Tt=function(n,t){var r;if(!n||!ft[typeof n])return n;for(r in n)if(t(n[r],r,n)===K)break;return n},$t=function(n,t){var r;if(!n||!ft[typeof n])return n;for(r in n)if(mt.call(n,r)&&t(n[r],r,n)===K)break;return n};y(/x/)&&(y=function(n){return typeof n=="function"&&"[object Function]"==dt.call(n)}),t.after=function(n,t){return 1>n?t():function(){return 1>--n?t.apply(this,arguments):void 0 }},t.bind=C,t.bindAll=function(n){for(var t=1T(o,i)){for(var a=r;--a;)if(0>T(t[a],i))continue n;o.push(i)}}return o},t.invert=v,t.invoke=function(n,t){var r=Bt.call(arguments,2),e=-1,u=typeof t=="function",o=n?n.length:0,i=Array(typeof o=="number"?o:0); diff --git a/lodash.js b/lodash.js index 8308b86c7..13814a6af 100644 --- a/lodash.js +++ b/lodash.js @@ -960,7 +960,7 @@ * // => true */ var isArray = nativeIsArray || function(value) { - return value && typeof value == 'object' && toString.call(value) == arrayClass; + return value ? (typeof value == 'object' && toString.call(value) == arrayClass) : false; }; /** @@ -1467,7 +1467,7 @@ * // => true */ function isDate(value) { - return value ? typeof value == 'object' && toString.call(value) == dateClass : false; + return value ? (typeof value == 'object' && toString.call(value) == dateClass) : false; } /** @@ -1921,7 +1921,7 @@ * // => true */ function isRegExp(value) { - return value ? typeof value == 'object' && toString.call(value) == regexpClass : false; + return value ? (typeof value == 'object' && toString.call(value) == regexpClass) : false; } /**