diff --git a/build.js b/build.js index 39b76dc0e..113abeeca 100755 --- a/build.js +++ b/build.js @@ -1651,9 +1651,11 @@ }); }); - // modify `_.every`, `_.find`, and `_.some` to use the private `indicatorObject` - source = source.replace(matchFunction(source, 'every'), function(match) { - return match.replace(/\(result *= *(.+?)\);/, '!(result = $1) && indicatorObject;'); + // modify `_.every`, `_.find`, `_.isEqual`, and `_.some` to use the private `indicatorObject` + _.each(['every', 'isEqual'], function(methodName) { + source = source.replace(matchFunction(source, methodName), function(match) { + return match.replace(/\(result *= *(.+?)\);/g, '!(result = $1) && indicatorObject;'); + }); }); source = source.replace(matchFunction(source, 'find'), function(match) { @@ -1681,7 +1683,7 @@ source = source.replace(matchFunction(source, data.methodName), function(match) { return match .replace(/(callback), *thisArg/g, '$1') - .replace(/^ *callback *=.+/m, 'callback || (callback = identity);') + .replace(/^( *)callback *=.+/m, '$1callback || (callback = identity);') }); } }); @@ -1696,11 +1698,6 @@ return match.replace(/(?:\s*\/\/.*)*\n( *)if *\(iteratesOwnLast[\s\S]+?\n\1}/, ''); }); - // remove JScript [[DontEnum]] fix from `_.isEqual` - source = source.replace(matchFunction(source, 'isEqual'), function(match) { - return match.replace(/(?:\s*\/\/.*)*\n( *)if *\(hasDontEnumBug[\s\S]+?\n\1}/, ''); - }); - // remove `noCharByIndex` from `_.reduceRight` source = source.replace(matchFunction(source, 'reduceRight'), function(match) { return match.replace(/}\s*else if *\(noCharByIndex[^}]+/, ''); diff --git a/lodash.underscore.min.js b/lodash.underscore.min.js index 9a46e535f..15b082713 100644 --- a/lodash.underscore.min.js +++ b/lodash.underscore.min.js @@ -6,27 +6,27 @@ ;(function(e,t){function n(e){if(e&&"object"==typeof e&&e.__wrapped__)return e;if(!(this instanceof n))return new n(e);this.__wrapped__=e}function r(e,t){var n=e.b,r=t.b,e=e.a,t=t.a;if(e!==t){if(e>t||"undefined"==typeof e)return 1;if(er&&(r=n,u=e)}); -else for(;++iu&&(u=e[i]);return u}function k(e,t){var n=[];return Lt(e,function(e){n.push(e[t])}),n}function L(e,t,n,r){var i=3>arguments.length;return t||(t=F),Lt(e,function(e,s,o){n=i?(i=!1,e):t.call(r,n,e,s,o)}),n}function A(e,t,n,r){var i=e?e.length:0,s=3>arguments.length;if("number"!=typeof i)var o=kt(e),i=o.length;return t||(t=F),Lt(e,function(u,a,f){a=o?o[--i]:--i,n=s?(s=!1,e[a]):t.call(r,n,e[a],a,f)}),n}function O(e,t,n){var r,t=s(t,n);if(Ct(e))for(var n=-1,i=e.length;++nn?at(0,i+n):n||0)-1;else if(n)return r=H(e,t),e[r]===t?r:-1;for(;++r>>1,n(e[r])D(a,f))n&&a.push(f),u.push(r)}return u}function j(e,t){return bt||it&&2"']/g,Q=/['\n\r\t\u2028\u2029\\]/g,G=Math.ceil,Y=U.concat,Z=Math.floor,et=R.hasOwnProperty,tt=U.push,nt=U.slice,rt=R.toString -,it=$.test(it=nt.bind)&&it,st=$.test(st=Array.isArray)&&st,ot=e.isFinite,ut=$.test(ut=Object.keys)&&ut,at=Math.max,ft=Math.min,lt=Math.random,ct="[object Array]",ht="[object Boolean]",pt="[object Date]",dt="[object Number]",vt="[object Object]",mt="[object RegExp]",gt="[object String]",yt=(yt={0:1,length:1},U.splice.call(yt,0,1),yt[0]),bt=it&&/\n|Opera/.test(it+rt.call(e.opera)),wt={"boolean":!1,"function":!0,object:!0,number:!1,string:!1,"undefined":!1},Et={"\\":"\\","'":"'","\n":"n","\r":"r"," " -:"t","\u2028":"u2028","\u2029":"u2029"};n.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},n.isArguments=function(e){return"[object Arguments]"==rt.call(e)},n.isArguments(arguments)||(n.isArguments=function(e){return e?et.call(e,"callee"):!1});var St=function(e,t){var n;if(!e)return e;t||(t=F);for(n in e)if(t(e[n],n,e)===W)break;return e},xt=function(e,t){var n;if(!e)return e;t||(t=F);for(n in e)if(et.call(e,n)&&t(e[n],n,e)===W)break; -return e},Tt={"&":"&","<":"<",">":">",'"':""","'":"'"},Nt=d(Tt),Ct=st||function(e){return rt.call(e)==ct};m(/x/)&&(m=function(e){return"[object Function]"==rt.call(e)});var kt=ut?function(e){return g(e)?ut(e):[]}:c,Lt=function(e,t,n){if(!e)return e;var t=t&&"undefined"==typeof n?t:s(t,n),r=e.length,n=-1;if("number"==typeof r){for(;++ne?t( -):function(){if(1>--e)return t.apply(this,arguments)}},n.bind=j,n.bindAll=function(e){for(var t=arguments,n=1D(r,s,n)&&i.push(s)}return i},n.escape=function(e){return null==e?"":(e+"").replace(K,u)},n.every=S,n.filter=x,n.find=T,n.first=M,n.flatten=_,n.forEach=Lt,n.functions=p,n.groupBy=function(e,t,n){var r={},t=s(t,n);return Lt(e,function(e,n,i){n=t(e,n,i),(et.call(r,n)?r[n]:r[n]=[]).push(e)}),r},n.has=function(e,t){return e?et.call(e,t):!1},n.identity= -F,n.indexOf=D,n.initial=function(e,t,n){return e?nt.call(e,0,-(null==t||n?1:t)):[]},n.intersection=function(e){var t=arguments,n=t.length,r=[];return Lt(e,function(e){if(0>D(r,e)){for(var i=n;--i;)if(0>D(t[i],e))return;r.push(e)}}),r},n.invert=d,n.invoke=function(e,t){var n=nt.call(arguments,2),r="function"==typeof t,i=[];return Lt(e,function(e){i.push((r?t:e[t]).apply(e,n))}),i},n.isArray=Ct,n.isBoolean=function(e){return!0===e||!1===e||rt.call(e)==ht},n.isDate=function(e){return rt.call(e)==pt} -,n.isElement=function(e){return e?1===e.nodeType:!1},n.isEmpty=function(e){if(!e)return!0;if(Ct(e)||b(e))return!e.length;for(var t in e)if(et.call(e,t))return!1;return!0},n.isEqual=v,n.isFinite=function(e){return ot(e)&&rt.call(e)==dt},n.isFunction=m,n.isNaN=function(e){return y(e)&&e!=+e},n.isNull=function(e){return null===e},n.isNumber=y,n.isObject=g,n.isRegExp=function(e){return rt.call(e)==mt},n.isString=b,n.isUndefined=function(e){return"undefined"==typeof e},n.keys=kt,n.last=function(e,t,n) -{if(e){var r=e.length;return null==t||n?e[r-1]:nt.call(e,-t||r)}},n.lastIndexOf=function(e,t,n){var r=e?e.length:0;for("number"==typeof n&&(r=(0>n?at(0,r+n):ft(n,r-1))+1);r--;)if(e[r]===t)return r;return-1},n.map=N,n.max=C,n.memoize=function(e,t){var n={};return function(){var r=t?t.apply(this,arguments):arguments[0];return et.call(n,r)?n[r]:n[r]=e.apply(this,arguments)}},n.min=function(e,t,n){var r=Infinity,i=-1,o=e?e.length:0,u=r;if(t||!Ct(e))t=s(t,n),Lt(e,function(e,n,i){n=t(e,n,i),nD(t,r,1)&&(n[r]=e)}),n},n.once=function(e){var t,n=!1;return function(){return n?t:(n=!0,t=e.apply(this,arguments),e=null,t)}},n.pairs=function(e){var t=[];return xt(e,function(e,n){t.push([n,e])}),t},n.pick=function( -e){for(var t=0,n=Y.apply(U,arguments),r=n.length,i={};++t=f?(clearTimeout(o),u=a,i=e.apply(s,r)):o||(o=setTimeout(n,f)),i}},n.times=function(e,t,n){for(var e=+e||0,r=-1,i=Array(e);++rD(arguments,i,1)&&r.push(i)}return r},n.wrap=function(e,t){return function(){var n=[e];return tt.apply(n,arguments),t.apply(this -,n)}},n.zip=function(e){for(var t=-1,n=e?C(k(arguments,"length")):0,r=Array(n);++tr&& +(r=n,u=e)});else for(;++iu&&(u=e[i]);return u}function k(e,t){var n=[];return Lt(e,function(e){n.push(e[t])}),n}function L(e,t,n,r){var i=3>arguments.length;return t||(t=F),Lt(e,function(e,s,o){n=i?(i=!1,e):t.call(r,n,e,s,o)}),n}function A(e,t,n,r){var i=e?e.length:0,s=3>arguments.length;if("number"!=typeof i)var o=kt(e),i=o.length;return t||(t=F),Lt(e,function(u,a,f){a=o?o[--i]:--i,n=s?(s=!1,e[a]):t.call(r,n,e[a],a,f)}),n}function O(e,t,n){var r,t=s(t,n);if(Ct(e))for(var n=-1,i=e.length +;++nn?at(0,i+n):n||0)-1;else if(n)return r=H(e,t),e[r]===t?r:-1;for(;++r>>1,n(e[r])D(a,f))n&&a.push(f),u.push(r)}return u}function j(e,t){return bt||it&&2"']/g,Q=/['\n\r\t\u2028\u2029\\]/g,G=Math.ceil,Y=U.concat,Z=Math.floor,et=R.hasOwnProperty,tt=U.push,nt=U.slice +,rt=R.toString,it=$.test(it=nt.bind)&&it,st=$.test(st=Array.isArray)&&st,ot=e.isFinite,ut=$.test(ut=Object.keys)&&ut,at=Math.max,ft=Math.min,lt=Math.random,ct="[object Array]",ht="[object Boolean]",pt="[object Date]",dt="[object Number]",vt="[object Object]",mt="[object RegExp]",gt="[object String]",yt=(yt={0:1,length:1},U.splice.call(yt,0,1),yt[0]),bt=it&&/\n|Opera/.test(it+rt.call(e.opera)),wt={"boolean":!1,"function":!0,object:!0,number:!1,string:!1,"undefined":!1},Et={"\\":"\\","'":"'","\n":"n" +,"\r":"r"," ":"t","\u2028":"u2028","\u2029":"u2029"};n.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},n.isArguments=function(e){return"[object Arguments]"==rt.call(e)},n.isArguments(arguments)||(n.isArguments=function(e){return e?et.call(e,"callee"):!1});var St=function(e,t){var n;if(!e)return e;t||(t=F);for(n in e)if(t(e[n],n,e)===W)break;return e},xt=function(e,t){var n;if(!e)return e;t||(t=F);for(n in e)if(et.call(e,n)&&t(e[n] +,n,e)===W)break;return e},Tt={"&":"&","<":"<",">":">",'"':""","'":"'"},Nt=d(Tt),Ct=st||function(e){return rt.call(e)==ct};m(/x/)&&(m=function(e){return"[object Function]"==rt.call(e)});var kt=ut?function(e){return g(e)?ut(e):[]}:c,Lt=function(e,t,n){if(!e)return e;var t=t&&"undefined"==typeof n?t:s(t,n),r=e.length,n=-1;if("number"==typeof r){for(;++ne?t():function(){if(1>--e)return t.apply(this,arguments)}},n.bind=j,n.bindAll=function(e){for(var t=arguments,n=1D(r,s,n)&&i.push(s)}return i},n.escape=function(e){return null==e?"":(e+"").replace(K,u)},n.every=S,n.filter=x,n.find=T,n.first=M,n.flatten=_,n.forEach=Lt,n.functions=p,n.groupBy=function(e,t,n){var r={},t=s(t,n);return Lt(e,function(e,n,i){n=t(e,n,i),(et.call(r,n)?r[n]:r[n]=[]).push(e)}),r},n.has=function(e,t){return e?et.call +(e,t):!1},n.identity=F,n.indexOf=D,n.initial=function(e,t,n){return e?nt.call(e,0,-(null==t||n?1:t)):[]},n.intersection=function(e){var t=arguments,n=t.length,r=[];return Lt(e,function(e){if(0>D(r,e)){for(var i=n;--i;)if(0>D(t[i],e))return;r.push(e)}}),r},n.invert=d,n.invoke=function(e,t){var n=nt.call(arguments,2),r="function"==typeof t,i=[];return Lt(e,function(e){i.push((r?t:e[t]).apply(e,n))}),i},n.isArray=Ct,n.isBoolean=function(e){return!0===e||!1===e||rt.call(e)==ht},n.isDate=function(e){return rt +.call(e)==pt},n.isElement=function(e){return e?1===e.nodeType:!1},n.isEmpty=function(e){if(!e)return!0;if(Ct(e)||b(e))return!e.length;for(var t in e)if(et.call(e,t))return!1;return!0},n.isEqual=v,n.isFinite=function(e){return ot(e)&&rt.call(e)==dt},n.isFunction=m,n.isNaN=function(e){return y(e)&&e!=+e},n.isNull=function(e){return null===e},n.isNumber=y,n.isObject=g,n.isRegExp=function(e){return rt.call(e)==mt},n.isString=b,n.isUndefined=function(e){return"undefined"==typeof e},n.keys=kt,n.last=function( +e,t,n){if(e){var r=e.length;return null==t||n?e[r-1]:nt.call(e,-t||r)}},n.lastIndexOf=function(e,t,n){var r=e?e.length:0;for("number"==typeof n&&(r=(0>n?at(0,r+n):ft(n,r-1))+1);r--;)if(e[r]===t)return r;return-1},n.map=N,n.max=C,n.memoize=function(e,t){var n={};return function(){var r=t?t.apply(this,arguments):arguments[0];return et.call(n,r)?n[r]:n[r]=e.apply(this,arguments)}},n.min=function(e,t,n){var r=Infinity,i=-1,o=e?e.length:0,u=r;if(t||!Ct(e))t=s(t,n),Lt(e,function(e,n,i){n=t(e,n,i),nD(t,r,1)&&(n[r]=e)}),n},n.once=function(e){var t,n=!1;return function(){return n?t:(n=!0,t=e.apply(this,arguments),e=null,t)}},n.pairs=function(e){var t=[];return xt(e,function(e,n){t.push([n,e])}),t},n. +pick=function(e){for(var t=0,n=Y.apply(U,arguments),r=n.length,i={};++t=f?(clearTimeout(o),u=a,i=e.apply(s,r)):o||(o=setTimeout(n,f)),i}},n.times=function(e,t,n){for(var e=+e||0,r=-1,i=Array(e);++rD(arguments,i,1)&&r.push(i)}return r},n.wrap=function(e,t){return function(){var n=[e];return tt.apply(n,arguments +),t.apply(this,n)}},n.zip=function(e){for(var t=-1,n=e?C(k(arguments,"length")):0,r=Array(n);++t