From ada611507342d52e62b30f17c599b459c81eb712 Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Fri, 19 Oct 2012 08:16:11 -0700 Subject: [PATCH] Simplify `_.bindAll`. Former-commit-id: 02de2a2a6020461d42e222a476c2fb7e66f6895e --- build.js | 2 +- lodash.js | 17 +++++++++++------ lodash.min.js | 36 ++++++++++++++++++------------------ lodash.underscore.min.js | 30 +++++++++++++++--------------- 4 files changed, 45 insertions(+), 40 deletions(-) diff --git a/build.js b/build.js index 88ea163c0..941ea5c6a 100755 --- a/build.js +++ b/build.js @@ -65,7 +65,7 @@ var dependencyMap = { 'after': [], 'bind': ['isFunction'], - 'bindAll': ['bind', 'isFunction'], + 'bindAll': ['bind', 'forIn', 'isFunction'], 'chain': ['mixin'], 'clone': ['extend', 'forEach', 'forOwn', 'isArguments', 'isPlainObject'], 'compact': [], diff --git a/lodash.js b/lodash.js index 8e943d0c7..c0ed2491b 100644 --- a/lodash.js +++ b/lodash.js @@ -427,7 +427,7 @@ 'inLoop': 'if (callback(value, index, collection) === false) return result' }; - /** Reusable iterator options for `bindAll`, `defaults`, and `extend` */ + /** Reusable iterator options for `defaults`, and `extend` */ var extendIteratorOptions = { 'useHas': false, 'useStrict': false, @@ -662,6 +662,9 @@ if ((data.firstArg = /^[^,]+/.exec(args)[0]) != 'collection' || !data.arrayBranch.inLoop) { data.arrayBranch = null; } + if (!data.objectBranch.inLoop) { + data.objectBranch = null; + } // create the function factory var factory = Function( 'bind, createCallback, forIn, hasOwnProperty, isArguments, isFunction, ' + @@ -3204,7 +3207,9 @@ * jQuery('#lodash_button').on('click', buttonView.onClick); * // => When the button is clicked, `this.label` will have the correct value */ - var bindAll = createIterator(extendIteratorOptions, { + var bindAll = createIterator({ + 'useStrict': false, + 'args': 'object', 'top': 'var funcs = arguments,\n' + ' length = funcs.length;\n' + @@ -3214,10 +3219,10 @@ ' result[index] = bind(result[index], result)\n' + ' }\n' + ' return result\n' + - '}', - 'inLoop': - 'if (isFunction(value)) result[index] = bind(value, result)', - 'bottom': false + '}\n' + + 'forIn(result, function(value, key) {\n' + + ' if (isFunction(value)) result[key] = bind(value, result)\n' + + '})' }); /** diff --git a/lodash.min.js b/lodash.min.js index 69c57cd1c..3d88ac7ff 100644 --- a/lodash.min.js +++ b/lodash.min.js @@ -4,7 +4,7 @@ */ ;(function(e,t){function s(e){if(e&&e.__wrapped__)return e;if(!(this instanceof s))return new s(e);this.__wrapped__=e}function o(e,t,n){t||(t=0);var r=e.length,i=r-t>=(n||J),s=i?{}:e;if(i)for(n=t-1;++nn||e===t)return 1;if(es;s++)i+="h='"+e.o[s]+"';if(","constructor"==e.o[s]&&(i+="!(f&&f.prototype===i)&&"),i+="g.call(i,h)){u=i[h];"+ e.l.h+"}"}if(e.c||e.m)i+="}"}return i+=e.e+";return p",Function("v,e,forIn,g,x,y,z,k,o,r,t","return function("+t+"){"+i+"}")(R,f,Yt,ht,v,m,$t,wt,dt,Mt,mt)}function c(e){return"\\"+Jt[e]}function h(e){return nn[e]}function p(){}function d(e){return rn[e]}function v(e){return mt.call(e)==Tt}function m(e){return"function"==typeof e}function g(e){var t=i;if(!e||"object"!=typeof e||v(e))return t;var n=e.constructor;return(!Rt||"function"==typeof e.toString||"string"!=typeof (e+""))&&(!m(n)||n instanceof n)?Bt?(Yt(e,function(e,n,r){return t=!ht.call(r,n),i}),t===i):(Yt(e,function(e,n){t=n}),t===i||ht.call(e,t)):t}function y(e){var t=[];return Zt(e,function(e,n){t.push(n)}),t}function b(e,t,n,s,o){if(e==r)return e;n&&(t=i);if(n=$t[typeof e]){var u=mt.call(e);if(!Vt[u]||Ft&&v(e))return e;var a=u==Nt,n=a||(u==At?tn(e):n)}if(!n||!t)return n?a?vt.call(e):on({},e):e;n=e.constructor;switch(u){case Ct:case kt:return new n(+e);case Lt:case Mt:return new n(e);case Ot:return n(e.source,tt.exec(e))}s||(s=[]) @@ -21,20 +21,20 @@ global&&global&&global==global.global&&(e=global),exports),X=Array.prototype,V=O Lt="[object Number]",At="[object Object]",Ot="[object RegExp]",Mt="[object String]",_t=e.clearTimeout,Dt=e.setTimeout,Pt,Ht,Bt,jt=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)jt=!r;Pt=4>(n+"").length,Bt="x"!=n[0],Ht=(n.splice.call(t,0,1),t[0])})(1);var Ft=!v(arguments),It="x"!=vt.call("x")[0],qt="xx"!="x"[0]+Object("x")[0];try{var Rt=("[object Object]",mt.call(e.document||0)==At)}catch(Ut){}var zt=gt&&/\n|Opera/ .test(gt+mt.call(e.opera)),Wt=wt&&/^.+$|true/.test(wt+!!e.attachEvent),Xt=!zt,Vt={};Vt[Tt]=Vt["[object Function]"]=i,Vt[Nt]=Vt[Ct]=Vt[kt]=Vt[Lt]=Vt[At]=Vt[Ot]=Vt[Mt]=n;var $t={"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 Kt={a:"d,c,s",p:"c=e(c,s)",h:"if(c(u,h,d)===false)return p" },Qt={q:i,r:i,a:"l",p:"for(var a=1,b=arguments.length;a":">",'"' -:""","'":"'"},rn=E(nn),sn=l(Qt,{h:"if(p[h]==null)"+Qt.h}),on=l(Qt),un=wt?function(e){var t=typeof e;return"function"==t&&dt.call(e,"prototype")?y(e):e&&$t[t]?wt(e):[]}:y,an=l(Kt),fn=l(Qt,{p:"var w=arguments,j=w.length;if(j>1){while(--j){h=w[j];p[h]=v(p[h],p)}return p}",h:"if(y(u))p[h]=v(u,p)",e:i});s.VERSION="0.8.2",s.after=function(e,t){return 1>e?t():function(){if(1>--e)return t.apply(this,arguments)}},s.bind=R,s.bindAll=fn,s.chain=function(e){return e=new s(e),e.__chain__=n,e},s.clone= -b,s.compact=function(e){for(var t=-1,n=e?e.length:0,r=[];++tj(s,u)){for(var a=1;an?Et(0,r+n):St(n,r-1))+1);r--;)if(e[r]===t)return r;return-1},s.lateBind=function(e,t){return a(t,e,vt.call(arguments,2))},s.map=A,s.max=O,s.memoize=function(e,t){var n={};return function(){var r=t?t.apply(this,arguments):arguments[0];return ht.call(n,r)?n[r]:n[r]=e.apply(this,arguments)}},s.merge=x,s.min=function(e,t,n){var r=Infinity,i=-1,s=e?e.length:0,o=r;if(t||s!==+s)t=f(t,n),an(e,function(e,n -,i){n=t(e,n,i),nj(s,n,1))i[n]=e}),i},s.once=function(e){var t,s=i;return function(){return s?t:(s=n,t=e.apply(this,arguments),e=r,t -)}},s.pairs=function(e){var t=[];return Zt(e,function(e,n){t.push([n,e])}),t},s.partial=function(e){return a(e,vt.call(arguments,1))},s.pick=function(e,t,n){var r={};if("function"!=typeof t)for(var i=0,s=ft.apply(X,arguments),o=s.length;++i=f?(_t(u),a=r,s=e.apply(o,i)):u||(u=Dt(n,f)),s}},s.times=function(e,t,n){for(var e=+e||0,r=-1,i=Array(e);++rj(r,i)&&r.push(i)}return r},s.uniq=q,s.uniqueId=function(e){var t=$++;return e?e+t:t},s.values=T,s.where=function(e,t){var n=[];Yt(t,function(e,t){n.push(t)});var r=n.length,i=[];return an(e,function(e){for(var s=-1;++s1){while(--j){h=w[j];p[h]=v(p[h],p)}return p}forIn(p,function(u,key){if(y(u))p[key]=v(u,p)})"});s.VERSION="0.8.2",s.after=function(e,t){return 1>e?t():function(){if(1>--e)return t.apply(this,arguments)}},s.bind=R,s.bindAll=fn,s.chain=function(e){return e=new s( +e),e.__chain__=n,e},s.clone=b,s.compact=function(e){for(var t=-1,n=e?e.length:0,r=[];++tj(s,u)){for(var a=1;an?Et(0,r+n):St(n,r-1))+1);r--;)if(e[r]===t)return r;return-1},s.lateBind=function(e,t){return a(t,e,vt.call(arguments,2))},s.map=A,s.max=O,s.memoize=function(e,t){var n={};return function(){var r=t?t.apply(this,arguments):arguments[0];return ht.call(n,r)?n[r]:n[r]=e.apply(this,arguments)}},s.merge=x,s.min=function(e,t,n){var r=Infinity,i=-1,s=e?e.length:0,o=r;if(t||s!==+ +s)t=f(t,n),an(e,function(e,n,i){n=t(e,n,i),nj(s,n,1))i[n]=e}),i},s.once=function(e){var t,s=i;return function(){return s?t:(s=n,t=e +.apply(this,arguments),e=r,t)}},s.pairs=function(e){var t=[];return Zt(e,function(e,n){t.push([n,e])}),t},s.partial=function(e){return a(e,vt.call(arguments,1))},s.pick=function(e,t,n){var r={};if("function"!=typeof t)for(var i=0,s=ft.apply(X,arguments),o=s.length;++i=f?(_t(u),a=r,s=e.apply(o,i)):u||(u=Dt(n,f)),s}},s.times=function(e,t,n){for(var e=+e||0,r=-1,i=Array(e);++rj(r,i)&&r.push(i)}return r},s.uniq=q,s.uniqueId=function(e){var t=$++;return e?e+t:t},s.values=T,s.where=function(e,t){var n=[];Yt(t,function(e,t){n.push(t)});var r=n.length,i=[];return an(e,function(e){for(var s=-1;++s"']/g,Z=/['\n\r\t\u2028\u2029\\]/g,et=Math.ceil,tt=X.concat,nt=Math.floor,rt=V.hasOwnProperty,it=X.push,st=X.slice,ot=V.toString,ut=Q.test( ut=st.bind)&&ut,at=Q.test(at=Array.isArray)&&at,ft=e.isFinite,lt=Q.test(lt=Object.keys)&<,ct=Math.max,ht=Math.min,pt=Math.random,dt="[object Array]",vt="[object Boolean]",mt="[object Date]",gt="[object Number]",yt="[object Object]",bt="[object RegExp]",wt="[object String]",Et=e.clearTimeout,St=e.setTimeout,xt;(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);xt=(n.splice.call(t,0,1),t[0])})(1);var Tt=ut&&/\n|Opera/.test(ut+ot.call(e .opera)),Nt={"boolean":i,"function":n,object:n,number:i,string:i,"undefined":i,unknown:n},Ct={"\\":"\\","'":"'","\n":"n","\r":"r"," ":"t","\u2028":"u2028","\u2029":"u2029"};l.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},l.isArguments=function(e){return"[object Arguments]"==ot.call(e)},l.isArguments(arguments)||(l.isArguments=function(e){return e?rt.call(e,"callee"):i});var kt=at||function(e){return ot.call(e)==dt};y(/x/)&&(y=function( -e){return"[object Function]"==ot.call(e)});var Lt={"&":"&","<":"<",">":">",'"':""","'":"'"},At=E(Lt),Ot=lt?function(e){return e&&Nt[typeof e]?lt(e):[]}:b;l.VERSION="0.8.2",l.after=function(e,t){return 1>e?t():function(){if(1>--e)return t.apply(this,arguments)}},l.bind=R,l.bindAll=function(e){var t,n,r=e,s=e;if(!e)return s;n=arguments;var o=n.length;if(1j(r,s,n)&&i.push(s)}return i},l.escape=function(e){return e==r?"":(e+"").replace(Y,v)} -,l.every=C,l.extend=o,l.filter=k,l.find=L,l.first=H,l.flatten=B,l.forEach=s,l.functions=w,l.groupBy=function(e,t,n){var r={},t=p(t,n);return s(e,function(e,n,i){n=t(e,n,i),(rt.call(r,n)?r[n]:r[n]=[]).push(e)}),r},l.has=function(e,t){return e?rt.call(e,t):i},l.identity=U,l.indexOf=j,l.initial=function(e,t,n){return e?st.call(e,0,-(t==r||n?1:t)):[]},l.intersection=function(e){var t=arguments.length,n=-1,r=e.length,i=[];e:for(;++nj(i,s)){for(var o=1;oj(arguments[o],s -))continue e;i.push(s)}}return i},l.invert=E,l.invoke=function(e,t){var n=st.call(arguments,2),r="function"==typeof t,i=[];return s(e,function(e){i.push((r?t:e[t]).apply(e,n))}),i},l.isArray=kt,l.isBoolean=function(e){return e===n||e===i||ot.call(e)==vt},l.isDate=function(e){return ot.call(e)==mt},l.isElement=function(e){return e?1===e.nodeType:i},l.isEmpty=function(e){if(!e)return n;if(kt(e)||x(e))return!e.length;for(var t in e)if(rt.call(e,t))return i;return n},l.isEqual=S,l.isFinite=function(e -){return ft(e)&&ot.call(e)==gt},l.isFunction=y,l.isNaN=function(e){return ot.call(e)==gt&&e!=+e},l.isNull=function(e){return e===r},l.isNumber=function(e){return ot.call(e)==gt},l.isObject=function(e){return e?Nt[typeof e]:i},l.isRegExp=function(e){return ot.call(e)==bt},l.isString=x,l.isUndefined=function(e){return e===t},l.keys=Ot,l.last=function(e,t,n){if(e){var i=e.length;return t==r||n?e[i-1]:st.call(e,-t||i)}},l.lastIndexOf=function(e,t,n){var r=e?e.length:0;for("number"==typeof n&&(r=(0>n? -ct(0,r+n):ht(n,r-1))+1);r--;)if(e[r]===t)return r;return-1},l.map=A,l.max=O,l.memoize=function(e,t){var n={};return function(){var r=t?t.apply(this,arguments):arguments[0];return rt.call(n,r)?n[r]:n[r]=e.apply(this,arguments)}},l.min=function(e,t,n){var r=Infinity,i=-1,o=e?e.length:0,u=r;if(t||o!==+o)t=p(t,n),s(e,function(e,n,i){n=t(e,n,i),nj(t,r,1)&&(n[r]=e)}),n},l.once=function(e){var t,s=i;return function(){return s?t:(s=n,t=e.apply(this,arguments),e=r,t)}},l.pairs=function(e){var t=[];return a(e,function(e,n){t.push([n,e])}),t},l.pick=function(e){for(var t=0,n=tt.apply(X,arguments),r=n.length,i={};++t=f?(Et(u),a=r,s=e.apply(o,i)):u||(u=St(n,f)),s}},l.times=function(e,t,n){for(var e=+e||0,r=-1,i=Array(e);++rj(r,i)&&r.push(i)}return r},l.uniq=q,l.uniqueId=function(e){var t= -$++;return e?e+t:t},l.values=T,l.where=function(e,t){var n=[];f(t,function(e,t){n.push(t)});var r=n.length,i=[];return s(e,function(e){for(var s=-1;++sj(arguments,i,1)&&r.push(i)}return r},l.wrap=function(e,t){return function(){var n=[e];return arguments.length&&it.apply(n,arguments),t.apply(this,n)}},l.zip=function(e){for(var t=-1,n=e?O(M(arguments,"length")):0,r=Array -(n);++t":">",'"':""","'":"'"},At=E(Lt),Ot=lt?function(e){return e&&Nt[typeof e]?lt(e):[]}:b;l.VERSION="0.8.2",l.after=function(e,t){return 1>e?t():function(){if(1>--e)return t.apply(this,arguments)}},l.bind=R,l.bindAll=function(e){var t,n=e;if(!e)return n;var r=arguments,i=r.length;if(1j(r,s,n)&&i.push(s)}return i},l.escape=function(e){return e==r?"":(e+"").replace(Y,v)},l. +every=C,l.extend=o,l.filter=k,l.find=L,l.first=H,l.flatten=B,l.forEach=s,l.functions=w,l.groupBy=function(e,t,n){var r={},t=p(t,n);return s(e,function(e,n,i){n=t(e,n,i),(rt.call(r,n)?r[n]:r[n]=[]).push(e)}),r},l.has=function(e,t){return e?rt.call(e,t):i},l.identity=U,l.indexOf=j,l.initial=function(e,t,n){return e?st.call(e,0,-(t==r||n?1:t)):[]},l.intersection=function(e){var t=arguments.length,n=-1,r=e.length,i=[];e:for(;++nj(i,s)){for(var o=1;oj(arguments[o],s))continue e +;i.push(s)}}return i},l.invert=E,l.invoke=function(e,t){var n=st.call(arguments,2),r="function"==typeof t,i=[];return s(e,function(e){i.push((r?t:e[t]).apply(e,n))}),i},l.isArray=kt,l.isBoolean=function(e){return e===n||e===i||ot.call(e)==vt},l.isDate=function(e){return ot.call(e)==mt},l.isElement=function(e){return e?1===e.nodeType:i},l.isEmpty=function(e){if(!e)return n;if(kt(e)||x(e))return!e.length;for(var t in e)if(rt.call(e,t))return i;return n},l.isEqual=S,l.isFinite=function(e){return ft( +e)&&ot.call(e)==gt},l.isFunction=y,l.isNaN=function(e){return ot.call(e)==gt&&e!=+e},l.isNull=function(e){return e===r},l.isNumber=function(e){return ot.call(e)==gt},l.isObject=function(e){return e?Nt[typeof e]:i},l.isRegExp=function(e){return ot.call(e)==bt},l.isString=x,l.isUndefined=function(e){return e===t},l.keys=Ot,l.last=function(e,t,n){if(e){var i=e.length;return t==r||n?e[i-1]:st.call(e,-t||i)}},l.lastIndexOf=function(e,t,n){var r=e?e.length:0;for("number"==typeof n&&(r=(0>n?ct(0,r+n):ht +(n,r-1))+1);r--;)if(e[r]===t)return r;return-1},l.map=A,l.max=O,l.memoize=function(e,t){var n={};return function(){var r=t?t.apply(this,arguments):arguments[0];return rt.call(n,r)?n[r]:n[r]=e.apply(this,arguments)}},l.min=function(e,t,n){var r=Infinity,i=-1,o=e?e.length:0,u=r;if(t||o!==+o)t=p(t,n),s(e,function(e,n,i){n=t(e,n,i),nj(t,r,1)&&(n[r]=e)}),n},l.once=function(e){var t,s=i;return function(){return s?t:(s=n,t=e.apply(this,arguments),e=r,t)}},l.pairs=function(e){var t=[];return a(e,function(e,n){t.push([n,e])}),t},l.pick=function(e){for(var t=0,n=tt.apply(X,arguments),r=n.length,i={};++t=f?(Et(u),a=r,s=e.apply(o,i)):u||(u=St(n,f)),s}},l.times=function(e,t,n){for(var e=+e||0,r=-1,i=Array(e);++rj(r,i)&&r.push(i)}return r},l.uniq=q,l.uniqueId=function(e){var t=$++;return e? +e+t:t},l.values=T,l.where=function(e,t){var n=[];f(t,function(e,t){n.push(t)});var r=n.length,i=[];return s(e,function(e){for(var s=-1;++sj(arguments,i,1)&&r.push(i)}return r},l.wrap=function(e,t){return function(){var n=[e];return arguments.length&&it.apply(n,arguments),t.apply(this,n)}},l.zip=function(e){for(var t=-1,n=e?O(M(arguments,"length")):0,r=Array(n);++t