Ensure we use an underscore build of _.result.

This commit is contained in:
John-David Dalton
2014-01-19 12:28:25 -08:00
parent 677fb93494
commit cad0f1f396
2 changed files with 8 additions and 10 deletions

View File

@@ -4866,12 +4866,11 @@
* _.result(object, 'employer', 'slate');
* // => 'slate'
*/
function result(object, key, defaultValue) {
if (object == null) {
return defaultValue;
function result(object, key) {
if (object != null) {
var value = object[key];
return isFunction(value) ? object[key]() : value;
}
var value = typeof object[key] != 'undefined' ? object[key] : defaultValue;
return isFunction(value) ? object[key]() : value;
}
/**

View File

@@ -33,8 +33,7 @@ return function(){return r?t:(r=true,t=n.apply(this,arguments),n=null,t)}},f.pai
for(r=p(r,t,1);++e<n;)u[e]=r(e);return u},f.toArray=function(n){return it(n)?E(n):n&&typeof n.length=="number"?$(n):Y(n)},f.union=function(){return m(v(arguments,true,true))},f.uniq=S,f.values=Y,f.where=C,f.without=function(n){return g(n,E(arguments,1))},f.wrap=function(n,r){return b(r,pr,[n])},f.zip=function(){for(var n=-1,r=I(ot(arguments,"length")),t=Array(0>r?0:r);++n<r;)t[n]=ot(arguments,n);return t},f.collect=$,f.drop=A,f.each=B,f.extend=V,f.methods=H,f.object=function(n,r){var t=-1,e=n?n.length:0,u={};
for(r||!e||it(n[0])||(r=[]);++t<e;){var o=n[t];r?u[o]=r[t]:o&&(u[o[0]]=o[1])}return u},f.select=q,f.tail=A,f.unique=S,f.clone=function(n){return L(n)?it(n)?E(n):V({},n):n},f.contains=k,f.escape=function(n){return null==n?"":(n+"").replace(hr,u)},f.every=N,f.find=F,f.has=function(n,r){return n?Pr.call(n,r):false},f.identity=nr,f.indexOf=T,f.isArguments=j,f.isArray=it,f.isBoolean=function(n){return true===n||false===n||n&&typeof n=="object"&&Mr.call(n)==br||false},f.isDate=function(n){return n&&typeof n=="object"&&Mr.call(n)==dr||false
},f.isElement=function(n){return n&&1===n.nodeType||false},f.isEmpty=J,f.isEqual=function(n,r){return y(n,r)},f.isFinite=function(n){return Kr(n)&&!Lr(parseFloat(n))},f.isFunction=K,f.isNaN=function(n){return Q(n)&&n!=+n},f.isNull=function(n){return null===n},f.isNumber=Q,f.isObject=L,f.isRegExp=function(n){var r=typeof n;return n&&("function"==r||"object"==r)&&Mr.call(n)==xr||false},f.isString=X,f.isUndefined=function(n){return typeof n=="undefined"},f.lastIndexOf=function(n,r,t){var e=n?n.length:0;for(typeof t=="number"&&(e=(0>t?Xr(0,e+t):Yr(t,e-1))+1);e--;)if(n[e]===r)return e;
return-1},f.mixin=tr,f.noConflict=function(){return kr._=Ir,this},f.random=function(n,r){return null==n&&null==r&&(r=1),n=+n||0,null==r?(r=n,n=0):r=+r||0,n+zr(nt()*(r-n+1))},f.reduce=M,f.reduceRight=D,f.result=function(n,r,t){return null==n?t:(t="undefined"!=typeof n[r]?n[r]:t,K(t)?n[r]():t)},f.size=function(n){var r=n?n.length:0;return typeof r=="number"?r:ft(n).length},f.some=z,f.sortedIndex=O,f.template=function(n,r,t){var e=f,u=e.templateSettings;n=(n||"")+"",t=G({},t,u);var i=0,a="__p+='",u=t.variable;
n.replace(RegExp((t.escape||vr).source+"|"+(t.interpolate||vr).source+"|"+(t.evaluate||vr).source+"|$","g"),function(r,t,e,u,f){return a+=n.slice(i,f).replace(yr,o),t&&(a+="'+_.escape("+t+")+'"),u&&(a+="';"+u+";\n__p+='"),e&&(a+="'+((__t=("+e+"))==null?'':__t)+'"),i=f+r.length,r}),a+="';",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 c=Function("_","return "+a)(e)}catch(l){throw l.source=a,l
}return r?c(r):(c.source=a,c)},f.unescape=function(n){return null==n?"":(n+="",0>n.indexOf(";")?n:n.replace(gr,i))},f.uniqueId=function(n){var r=++or+"";return n?n+r:r},f.all=N,f.any=z,f.detect=F,f.findWhere=function(n,r){return C(n,r,true)},f.foldl=M,f.foldr=D,f.include=k,f.inject=M,f.first=x,f.last=function(n,r,t){var e=0,u=n?n.length:0;if(typeof r!="number"&&null!=r){var o=u;for(r=Z(r,t,3);o--&&r(n[o],o,n);)e++}else if(e=r,null==e||t)return n?n[u-1]:ur;return e=u-e,E(n,0<e?e:0)},f.sample=function(n,r,t){return n&&typeof n.length!="number"&&(n=Y(n)),null==r||t?n?n[0+zr(nt()*(n.length-1-0+1))]:ur:(n=W(n),n.length=Yr(Xr(0,r),n.length),n)
},f.take=x,f.head=x,tr(V({},f)),f.VERSION="2.4.1",f.prototype.chain=function(){return this.__chain__=true,this},f.prototype.value=function(){return this.__wrapped__},h("pop push reverse shift sort splice unshift".split(" "),function(n){var r=Rr[n];f.prototype[n]=function(){var n=this.__wrapped__;return r.apply(n,arguments),rt.spliceObjects||0!==n.length||delete n[0],this}}),h(["concat","join","slice"],function(n){var r=Rr[n];f.prototype[n]=function(){var n=r.apply(this.__wrapped__,arguments);return this.__chain__&&(n=new a(n),n.__chain__=true),n
}}),typeof define=="function"&&typeof define.amd=="object"&&define.amd?(kr._=f, define(function(){return f})):Nr&&Fr?Br?(Fr.exports=f)._=f:Nr._=f:kr._=f}).call(this);
return-1},f.mixin=tr,f.noConflict=function(){return kr._=Ir,this},f.random=function(n,r){return null==n&&null==r&&(r=1),n=+n||0,null==r?(r=n,n=0):r=+r||0,n+zr(nt()*(r-n+1))},f.reduce=M,f.reduceRight=D,f.result=function(n,r){if(null!=n){var t=n[r];return K(t)?n[r]():t}},f.size=function(n){var r=n?n.length:0;return typeof r=="number"?r:ft(n).length},f.some=z,f.sortedIndex=O,f.template=function(n,r,t){var e=f,u=e.templateSettings;n=(n||"")+"",t=G({},t,u);var i=0,a="__p+='",u=t.variable;n.replace(RegExp((t.escape||vr).source+"|"+(t.interpolate||vr).source+"|"+(t.evaluate||vr).source+"|$","g"),function(r,t,e,u,f){return a+=n.slice(i,f).replace(yr,o),t&&(a+="'+_.escape("+t+")+'"),u&&(a+="';"+u+";\n__p+='"),e&&(a+="'+((__t=("+e+"))==null?'':__t)+'"),i=f+r.length,r
}),a+="';",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 c=Function("_","return "+a)(e)}catch(l){throw l.source=a,l}return r?c(r):(c.source=a,c)},f.unescape=function(n){return null==n?"":(n+="",0>n.indexOf(";")?n:n.replace(gr,i))},f.uniqueId=function(n){var r=++or+"";return n?n+r:r},f.all=N,f.any=z,f.detect=F,f.findWhere=function(n,r){return C(n,r,true)},f.foldl=M,f.foldr=D,f.include=k,f.inject=M,f.first=x,f.last=function(n,r,t){var e=0,u=n?n.length:0;
if(typeof r!="number"&&null!=r){var o=u;for(r=Z(r,t,3);o--&&r(n[o],o,n);)e++}else if(e=r,null==e||t)return n?n[u-1]:ur;return e=u-e,E(n,0<e?e:0)},f.sample=function(n,r,t){return n&&typeof n.length!="number"&&(n=Y(n)),null==r||t?n?n[0+zr(nt()*(n.length-1-0+1))]:ur:(n=W(n),n.length=Yr(Xr(0,r),n.length),n)},f.take=x,f.head=x,tr(V({},f)),f.VERSION="2.4.1",f.prototype.chain=function(){return this.__chain__=true,this},f.prototype.value=function(){return this.__wrapped__},h("pop push reverse shift sort splice unshift".split(" "),function(n){var r=Rr[n];
f.prototype[n]=function(){var n=this.__wrapped__;return r.apply(n,arguments),rt.spliceObjects||0!==n.length||delete n[0],this}}),h(["concat","join","slice"],function(n){var r=Rr[n];f.prototype[n]=function(){var n=r.apply(this.__wrapped__,arguments);return this.__chain__&&(n=new a(n),n.__chain__=true),n}}),typeof define=="function"&&typeof define.amd=="object"&&define.amd?(kr._=f, define(function(){return f})):Nr&&Fr?Br?(Fr.exports=f)._=f:Nr._=f:kr._=f}).call(this);