diff --git a/lodash.js b/lodash.js index 780d55df9..d6e248bfd 100644 --- a/lodash.js +++ b/lodash.js @@ -3267,7 +3267,22 @@ /*--------------------------------------------------------------------------*/ // expose Lo-Dash - if (freeExports) { + // some AMD build optimizers, like r.js, check for specific condition patterns like the following: + if (typeof define == 'function' && typeof define.amd == 'object' && define.amd) { + // Expose Lo-Dash to the global object even when an AMD loader is present in + // case Lo-Dash was injected by a third-party script and not intended to be + // loaded as a module. The global assignment can be reverted in the Lo-Dash + // module via its `noConflict()` method. + window._ = lodash; + + // define as an anonymous module so, through path mapping, it can be + // referenced as the "underscore" module + define(function() { + return lodash; + }); + } + // check for `exports` after `define` in case a build optimizer adds an `exports` object + else if (freeExports) { // in Node.js or RingoJS v0.8.0+ if (typeof module == 'object' && module && module.exports == freeExports) { (module.exports = lodash)._ = lodash; @@ -3277,21 +3292,8 @@ freeExports._ = lodash; } } - // in a browser or Rhino else { - // Expose Lo-Dash to the global object even when an AMD loader is present in - // case Lo-Dash was injected by a third-party script and not intended to be - // loaded as a module. The global assignment can be reverted in the Lo-Dash - // module via its `noConflict()` method. + // in a browser or Rhino window._ = lodash; - - // some AMD build optimizers, like r.js, check for specific condition patterns like the following: - if (typeof define == 'function' && typeof define.amd == 'object' && define.amd) { - // define as an anonymous module so, through path mapping, it can be - // referenced as the "underscore" module - define(function() { - return lodash; - }); - } } }(this)); diff --git a/lodash.min.js b/lodash.min.js index c2d673e96..b09c28b3c 100644 --- a/lodash.min.js +++ b/lodash.min.js @@ -2,30 +2,30 @@ Lo-Dash 0.2.0 lodash.com/license Underscore.js 1.3.3 github.com/documentcloud/underscore/blob/master/LICENSE */ -;(function(v,l){"use strict";function Q(a){return"[object Arguments]"==h.call(a)}function b(a){return new p(a)}function p(a){if(a&&a._wrapped)return a;this._wrapped=a}function k(){for(var a,c,d,j=-1,b=arguments.length,e={e:"",f:"",k:"",q:"",c:{d:"",m:"++l/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g +;(function(t,k){"use strict";function Q(a){return"[object Arguments]"==h.call(a)}function c(a){return new o(a)}function o(a){if(a&&a._wrapped)return a;this._wrapped=a}function j(){for(var a,b,d,w=-1,c=arguments.length,f={e:"",f:"",k:"",q:"",c:{d:"",m:"++l/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g ,variable:"object"};var ta=Function("n","var __p;with(n){__p='var l,r';if(k){__p+='='+k};__p+=';'+f+';'+q+';';if(c){__p+='var m='+g+'.length;l=-1;';if(o){__p+='if(m===+m){'};__p+=''+c['d']+';while('+c['m']+'){'+c['j']+'}';if(o){__p+='}'}}if(o){if(c){__p+='else{'}if(!i){__p+='var s=typeof '+l+'==\\'function\\';'};__p+=''+o['d']+';for('+o['m']+'){';if(i){if(r){__p+='if('+h+'){'};__p+=''+o['j']+';';if(r){__p+='}'}}else{__p+='if(!(s&&l==\\'prototype\\')';if(r){__p+='&&'+h};__p+='){'+o['j']+'}'};__p+='}';if(i){__p+='var g='+l+'.constructor;';for(var k=0;k<7;k++){__p+='l=\\''+p[k]+'\\';if(';if(p[k]=='constructor'){__p+='!(g&&g.prototype==='+l+')&&'};__p+=''+h+'){'+o['j']+'}'}}if(c){__p+='}'}};__p+=''+e+';return r'}return __p" -),t={a:"f,d,x",k:"f",q:"if(!d){d=k}else if(x){d=c(d,x)}",j:"d(f[l],l,f)"},$={k:"z",j:"if(!d(f[l],l,f))return!r"},aa={a:"n",k:"n",q:"for(var t,u=1,m=arguments.length;ua?c():function(){if(1>--a)return c.apply(this,arguments)}},b.bind=u,b.bindAll=function(a){var c=arguments,d=1;1==c.length&&(d=0,c=N(a));for(var b=c.length;dx(f,a[c])&&b.push(a[c]);return b},b.escape=function(a){return(a+"").replace(/&/g,"&").replace(/arguments.length&&(c=a||0,a=0);for(var b=-1,f=Math.max(Math.ceil((c-a)/d),0),e=Array(f);++bd?1:0}),"b")},b.sortedIndex=ha,b.tap=function(a,c){return c(a),a},b.template=function(a,c,d){d||(d={});var j;j=b.templateSettings -;var f=d.escape,e=d.evaluate,g=d.interpolate,d=d.variable;return f==o&&(f=j.escape),e==o&&(e=j.evaluate),g==o&&(g=j.interpolate),f&&(a=a.replace(f,xa)),g&&(a=a.replace(g,ya)),e&&(a=a.replace(e,za)),a="__p='"+a.replace(Da,va).replace(Ca,ua)+"';\n",w.length=0,d||(d=j.variable,a="with("+d+"||{}){"+a+"}"),a="function("+d+"){var __p,__t,__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}"+a+"return __p}",j=Function("_","return "+a)(b),c?j(c):(j.source=a,j)},b.throttle=function(a,c){ -function b(){i=new Date,g=l,a.apply(e,j)}var j,f,e,g,i=0;return function(){var h=new Date,k=c-(h-i);return j=arguments,e=this,0>=k?(i=h,f=a.apply(e,j)):g||(g=O(b,k)),f}},b.times=function(a,c,b){b&&(c=u(c,b));for(b=0;bx(c,b[a])&&c.push(b[a]);return c},b.uniq=la,b.uniqueId=function(a -){var b=Aa++;return a?a+b:b},b.values=ra,b.without=function(a){for(var b=m.call(arguments,1),d=-1,h=a.length,f=[];++dx(b,a[d])&&f.push(a[d]);return f},b.wrap=function(a,b){return function(){var d=[a];return arguments.length&&B.apply(d,arguments),b.apply(this,d)}},b.zip=function(){for(var a=-1,b=ja(P(arguments,"length")),d=Array(b);++aa?b():function(){if(1>--a)return b.apply(this,arguments)}},c.bind=u,c.bindAll=function(a){var b=arguments,d=1;1==b.length&&(d=0,b=N(a));for(var c=b.length;dx(e,a[b])&&c.push(a[b]);return c},c.escape=function(a){return(a+"").replace(/&/g,"&").replace(/arguments.length&&(b=a||0,a=0);for(var c=-1,e=Math.max(Math.ceil((b-a)/d),0),f=Array(e);++cc?1:0}),"b")},c.sortedIndex=ha,c.tap=function(a,b){return b(a),a},c.template=function(a,b,d){d||(d={});var h;h=c.templateSettings +;var e=d.escape,f=d.evaluate,g=d.interpolate,d=d.variable;return e==n&&(e=h.escape),f==n&&(f=h.evaluate),g==n&&(g=h.interpolate),e&&(a=a.replace(e,xa)),g&&(a=a.replace(g,ya)),f&&(a=a.replace(f,za)),a="__p='"+a.replace(Da,va).replace(Ca,ua)+"';\n",v.length=0,d||(d=h.variable,a="with("+d+"||{}){"+a+"}"),a="function("+d+"){var __p,__t,__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}"+a+"return __p}",h=Function("_","return "+a)(c),b?h(b):(h.source=a,h)},c.throttle=function(a,b){ +function d(){h=new Date,g=k,a.apply(f,c)}var c,e,f,g,h=0;return function(){var j=new Date,k=b-(j-h);return c=arguments,f=this,0>=k?(h=j,e=a.apply(f,c)):g||(g=O(d,k)),e}},c.times=function(a,b,d){d&&(b=u(b,d));for(d=0;dx(b,d[a])&&b.push(d[a]);return b},c.uniq=la,c.uniqueId=function(a +){var b=Aa++;return a?a+b:b},c.values=ra,c.without=function(a){for(var b=l.call(arguments,1),d=-1,c=a.length,e=[];++dx(b,a[d])&&e.push(a[d]);return e},c.wrap=function(a,b){return function(){var d=[a];return arguments.length&&B.apply(d,arguments),b.apply(this,d)}},c.zip=function(){for(var a=-1,b=ja(P(arguments,"length")),d=Array(b);++a - + - +