Add _.findWhere alias.

Former-commit-id: 2c70e59b71c22d902e499747444a196a85691554

build.js

@@ -44,6 +44,7 @@
     'drop': 'rest',
     'each': 'forEach',
     'extend': 'assign',
+    'findWhere': 'find',
     'foldl': 'reduce',
     'foldr': 'reduceRight',
     'head': 'first',
@@ -63,7 +64,7 @@
     'contains': ['include'],
     'every': ['all'],
     'filter': ['select'],
-    'find': ['detect'],
+    'find': ['detect', 'findWhere'],
     'first': ['head', 'take'],
     'forEach': ['each'],
     'functions': ['methods'],
@@ -230,7 +231,7 @@
   var allMethods = _.keys(dependencyMap);
 
   /** List of Lo-Dash methods */
-  var lodashMethods = _.without(allMethods, 'findWhere');
+  var lodashMethods = allMethods.slice();
 
   /** List of Backbone's Lo-Dash dependencies */
   var backboneDependencies = [
@@ -2364,6 +2365,47 @@
             '}'
           ].join('\n'));
         }
+        // add Underscore's `_.findWhere`
+        if (!useLodashMethod('findWhere') && !useLodashMethod('where')) {
+          source = source.replace(matchFunction(source, 'find'), function(match) {
+            var indent = getIndent(match);
+            return match && (match + [
+              '',
+              '/**',
+              ' * Examines each element in a `collection`, returning the first that',
+              ' * has the given `properties`. When checking `properties`, this method',
+              ' * performs a deep comparison between values to determine if they are',
+              ' * equivalent to each other.',
+              ' *',
+              ' * @static',
+              ' * @memberOf _',
+              ' * @category Collections',
+              ' * @param {Array|Object|String} collection The collection to iterate over.',
+              ' * @param {Object} properties The object of property values to filter by.',
+              ' * @returns {Mixed} Returns the found element, else `undefined`.',
+              ' * @example',
+              ' *',
+              ' * var food = [',
+              " *   { 'name': 'apple',  'organic': false, 'type': 'fruit' },",
+              " *   { 'name': 'banana', 'organic': true,  'type': 'fruit' },",
+              " *   { 'name': 'beet',   'organic': false, 'type': 'vegetable' }",
+              ' * ];',
+              ' *',
+              " * _.findWhere(food, { 'type': 'vegetable' });",
+              " * // => { 'name': 'beet', 'organic': false, 'type': 'vegetable' }",
+              ' */',
+              'function findWhere(object, properties) {',
+              '  return where(object, properties, true);',
+              '}',
+              ''
+            ].join('\n' + indent));
+          });
+
+          // replace alias assignment
+          source = source.replace(getMethodAssignments(source), function(match) {
+            return match.replace(/^( *lodash.findWhere *= *).+/m, '$1findWhere;');
+          });
+        }
         // replace `_.flatten`
         if (!useLodashMethod('flatten')) {
           source = replaceFunction(source, 'flatten', [
@@ -2846,48 +2888,6 @@
           });
         }
       }
-      // add Underscore's `_.findWhere`
-      if (_.contains(buildMethods, 'findWhere')) {
-        if (isUnderscore) {
-          source = source.replace(matchFunction(source, 'find'), function(match) {
-            var indent = getIndent(match);
-            return match && (match + [
-              '',
-              '/**',
-              ' * Examines each element in a `collection`, returning the first that',
-              ' * has the given `properties`. When checking `properties`, this method',
-              ' * performs a deep comparison between values to determine if they are',
-              ' * equivalent to each other.',
-              ' *',
-              ' * @static',
-              ' * @memberOf _',
-              ' * @category Collections',
-              ' * @param {Array|Object|String} collection The collection to iterate over.',
-              ' * @param {Object} properties The object of property values to filter by.',
-              ' * @returns {Mixed} Returns the found element, else `undefined`.',
-              ' * @example',
-              ' *',
-              ' * var food = [',
-              " *   { 'name': 'apple',  'organic': false, 'type': 'fruit' },",
-              " *   { 'name': 'banana', 'organic': true,  'type': 'fruit' },",
-              " *   { 'name': 'beet',   'organic': false, 'type': 'vegetable' }",
-              ' * ];',
-              ' *',
-              " * _.findWhere(food, { 'type': 'vegetable' });",
-              " * // => { 'name': 'beet', 'organic': false, 'type': 'vegetable' }",
-              ' */',
-              'function findWhere(object, properties) {',
-              '  return where(object, properties, true);',
-              '}',
-              ''
-            ].join('\n' + indent));
-          });
-        }
-        source = source.replace(getMethodAssignments(source), function(match) {
-          var methodName = isUnderscore ? 'findWhere' : 'find';
-          return match.replace(/^( *)lodash.find *=.+/m, '$&\n$1lodash.findWhere = ' + methodName + ';');
-        });
-      }
       // add Underscore's chaining methods
       if (isUnderscore ? !_.contains(plusMethods, 'chain') : _.contains(plusMethods, 'chain')) {
         source = addChainMethods(source);

dist/lodash.compat.js

@@ -2737,7 +2737,7 @@
      *
      * @static
      * @memberOf _
-     * @alias detect
+     * @alias detect, findWhere
      * @category Collections
      * @param {Array|Object|String} collection The collection to iterate over.
      * @param {Function|Object|String} [callback=identity] The function called per
@@ -5533,7 +5533,7 @@
     // add functions to `lodash.prototype`
     mixin(lodash);
 
-    // add Underscore `_.chain` compat
+    // add Underscore compat
     lodash.chain = lodash;
     lodash.prototype.chain = function() { return this; };
 
@@ -5588,6 +5588,7 @@
     lodash.all = every;
     lodash.any = some;
     lodash.detect = find;
+    lodash.findWhere = find;
     lodash.foldl = reduce;
     lodash.foldr = reduceRight;
     lodash.include = contains;

dist/lodash.compat.min.js

@@ -5,34 +5,34 @@
  * Underscore.js 1.4.4 underscorejs.org/LICENSE
  */
 ;!function(n){function t(e){function a(n){return n&&typeof n=="object"&&!Ar(n)&&ur.call(n,"__wrapped__")?n:new X(n)}function T(n,t,r){r=(r||0)-1;for(var e=n.length;++r<e;)if(n[r]===t)return r;return-1}function L(n){return n.charCodeAt(0)}function G(n,t){var r=n.b,e=t.b;if(n=n.a,t=t.a,n!==t){if(n>t||typeof n=="undefined")return 1;if(n<t||typeof t=="undefined")return-1}return r<e?-1:1}function H(n,t,r,e){function u(){var e=arguments,l=o?this:t;return a||(n=t[i]),r.length&&(e=e.length?(e=_r.call(e),c?e.concat(r):r.concat(e)):r),this instanceof u?(l=M(n.prototype),e=n.apply(l,e),lt(e)?e:l):n.apply(l,e)
-}var a=ct(n),o=!r,i=t;if(o){var c=e;r=t}else if(!a){if(!e)throw new Kt;t=n}return u}function J(n){function t(t){return-1<f(n,t)}function r(t){n.push(t)}function e(n){var t=typeof n;if("boolean"==t||null==n)return v[n];var r=v[t]||(t="object",g),e="number"==t?n:c+n;return"object"==t?r[e]?-1<T(r[e],n):!1:!!r[e]}function u(n){var t=typeof n;if("boolean"==t||null==n)v[n]=!0;else{var r=v[t]||(t="object",g),e="number"==t?n:c+n;"object"==t?o=(r[e]||(r[e]=[])).push(n)==p:r[e]=!0}}n||(n=[]);var o,i=-1,f=Q(),p=n.length,s=p>=l&&a.indexOf!=f,g={},v={"false":!1,"function":!1,"null":!1,number:{},object:g,string:{},"true":!1,undefined:!1};
+}var a=ct(n),o=!r,i=t;if(o){var c=e;r=t}else if(!a){if(!e)throw new Kt;t=n}return u}function J(n){function t(t){return-1<f(n,t)}function r(t){n.push(t)}function e(n){var t=typeof n;if("boolean"==t||null==n)return v[n];var r=v[t]||(t="object",g),e="number"==t?n:c+n;return"object"==t?r[e]?-1<T(r[e],n):!1:!!r[e]}function u(n){var t=typeof n;if("boolean"==t||null==n)v[n]=!0;else{var r=v[t]||(t="object",g),e="number"==t?n:c+n;"object"==t?o=(r[e]||(r[e]=[])).push(n)==p:r[e]=!0}}n||(n=[]);var o,i=-1,f=W(),p=n.length,s=p>=l&&a.indexOf!=f,g={},v={"false":!1,"function":!1,"null":!1,number:{},object:g,string:{},"true":!1,undefined:!1};
 if(s){for(;++i<p;)u(n[i]);o&&(s=v=g=null)}return s?{contains:e,push:u}:{contains:t,push:r}}function K(){for(var n,t={g:x,b:"",c:"",e:"r",f:"",h:"",i:!0,j:!!Br},r=0;n=arguments[r];r++)for(var e in n)t[e]=n[e];r=t.a,t.d=/^[^,]+/.exec(r)[0],n=Rt,r="return function("+r+"){",e="var m,r="+t.d+",C="+t.e+";if(!r)return C;"+t.h+";",t.b?(e+="var s=r.length;m=-1;if("+t.b+"){",xr.unindexedChars&&(e+="if(q(r)){r=r.split('')}"),e+="while(++m<s){"+t.f+";}}else{"):xr.nonEnumArgs&&(e+="var s=r.length;m=-1;if(s&&n(r)){while(++m<s){m+='';"+t.f+";}}else{"),xr.enumPrototypes&&(e+="var E=typeof r=='function';"),xr.enumErrorProps&&(e+="var D=r===j||r instanceof Error;");
 var u=[];if(xr.enumPrototypes&&u.push('!(E&&m=="prototype")'),xr.enumErrorProps&&u.push('!(D&&(m=="message"||m=="name"))'),t.i&&t.j)e+="var A=-1,B=z[typeof r]?t(r):[],s=B.length;while(++A<s){m=B[A];",u.length&&(e+="if("+u.join("&&")+"){"),e+=t.f+";",u.length&&(e+="}"),e+="}";else if(e+="for(m in r){",t.i&&u.push("l.call(r, m)"),u.length&&(e+="if("+u.join("&&")+"){"),e+=t.f+";",u.length&&(e+="}"),e+="}",xr.nonEnumShadows){for(e+="if(r!==y){var h=r.constructor,p=r===(h&&h.prototype),e=r===H?G:r===j?i:J.call(r),v=w[e];",k=0;7>k;k++)e+="m='"+t.g[k]+"';if((!(p&&v[m])&&l.call(r,m))",t.i||(e+="||(!v[m]&&r[m]!==y[m])"),e+="){"+t.f+"}";
-e+="}"}return(t.b||xr.nonEnumArgs)&&(e+="}"),e+=t.c+";return C",n("i,j,l,n,o,q,t,u,y,z,w,G,H,J",r+e+"}")(I,Ut,ur,et,Ar,pt,Br,a,Vt,q,kr,F,Qt,lr)}function M(n){return lt(n)?pr(n):{}}function U(n){return Pr[n]}function V(n){return"\\"+D[n]}function Q(){var n=(n=a.indexOf)==Ot?T:n;return n}function W(n){return typeof n.toString!="function"&&typeof(n+"")=="string"}function X(n){this.__wrapped__=n}function Y(){}function Z(n){return function(t,e,u,o){return typeof e!="boolean"&&null!=e&&(o=u,u=o&&o[e]===t?r:e,e=!1),null!=u&&(u=a.createCallback(u,o)),n(t,e,u,o)
-}}function nt(n){var t,e;return!n||lr.call(n)!=P||(t=n.constructor,ct(t)&&!(t instanceof t))||!xr.argsClass&&et(n)||!xr.nodeClass&&W(n)?!1:xr.ownLast?(qr(n,function(n,t,r){return e=ur.call(r,t),!1}),false!==e):(qr(n,function(n,t){e=t}),e===r||ur.call(n,e))}function tt(n,t,r){t||(t=0),typeof r=="undefined"&&(r=n?n.length:0);var e=-1;r=r-t||0;for(var u=$t(0>r?0:r);++e<r;)u[e]=n[t+e];return u}function rt(n){return zr[n]}function et(n){return lr.call(n)==O}function ut(n,t,e,u,o,i){var c=n;if(typeof t!="boolean"&&null!=t&&(u=e,e=t,t=!1),typeof e=="function"){if(e=typeof u=="undefined"?e:a.createCallback(e,u,1),c=e(c),typeof c!="undefined")return c;
-c=n}if(u=lt(c)){var l=lr.call(c);if(!$[l]||!xr.nodeClass&&W(c))return c;var f=Ar(c)}if(!u||!t)return u?f?tt(c):Fr({},c):c;switch(u=wr[l],l){case S:case A:return new u(+c);case N:case F:return new u(c);case z:return u(c.source,h.exec(c))}for(o||(o=[]),i||(i=[]),l=o.length;l--;)if(o[l]==n)return i[l];return c=f?u(c.length):{},f&&(ur.call(n,"index")&&(c.index=n.index),ur.call(n,"input")&&(c.input=n.input)),o.push(n),i.push(c),(f?Nr:Dr)(n,function(n,u){c[u]=ut(n,t,e,r,o,i)}),c}function at(n){var t=[];
+e+="}"}return(t.b||xr.nonEnumArgs)&&(e+="}"),e+=t.c+";return C",n("i,j,l,n,o,q,t,u,y,z,w,G,H,J",r+e+"}")(I,Ut,ur,et,Ar,pt,Br,a,Vt,q,kr,F,Wt,lr)}function M(n){return lt(n)?pr(n):{}}function U(n){return Pr[n]}function V(n){return"\\"+D[n]}function W(){var n=(n=a.indexOf)==Ot?T:n;return n}function Q(n){return typeof n.toString!="function"&&typeof(n+"")=="string"}function X(n){this.__wrapped__=n}function Y(){}function Z(n){return function(t,e,u,o){return typeof e!="boolean"&&null!=e&&(o=u,u=o&&o[e]===t?r:e,e=!1),null!=u&&(u=a.createCallback(u,o)),n(t,e,u,o)
+}}function nt(n){var t,e;return!n||lr.call(n)!=P||(t=n.constructor,ct(t)&&!(t instanceof t))||!xr.argsClass&&et(n)||!xr.nodeClass&&Q(n)?!1:xr.ownLast?(qr(n,function(n,t,r){return e=ur.call(r,t),!1}),false!==e):(qr(n,function(n,t){e=t}),e===r||ur.call(n,e))}function tt(n,t,r){t||(t=0),typeof r=="undefined"&&(r=n?n.length:0);var e=-1;r=r-t||0;for(var u=$t(0>r?0:r);++e<r;)u[e]=n[t+e];return u}function rt(n){return zr[n]}function et(n){return lr.call(n)==O}function ut(n,t,e,u,o,i){var c=n;if(typeof t!="boolean"&&null!=t&&(u=e,e=t,t=!1),typeof e=="function"){if(e=typeof u=="undefined"?e:a.createCallback(e,u,1),c=e(c),typeof c!="undefined")return c;
+c=n}if(u=lt(c)){var l=lr.call(c);if(!$[l]||!xr.nodeClass&&Q(c))return c;var f=Ar(c)}if(!u||!t)return u?f?tt(c):Fr({},c):c;switch(u=wr[l],l){case S:case A:return new u(+c);case N:case F:return new u(c);case z:return u(c.source,h.exec(c))}for(o||(o=[]),i||(i=[]),l=o.length;l--;)if(o[l]==n)return i[l];return c=f?u(c.length):{},f&&(ur.call(n,"index")&&(c.index=n.index),ur.call(n,"input")&&(c.input=n.input)),o.push(n),i.push(c),(f?Nr:Dr)(n,function(n,u){c[u]=ut(n,t,e,r,o,i)}),c}function at(n){var t=[];
 return qr(n,function(n,r){ct(n)&&t.push(r)}),t.sort()}function ot(n){for(var t=-1,r=Br(n),e=r.length,u={};++t<e;){var a=r[t];u[n[a]]=a}return u}function it(n,t,r,e,u,o){var c=r===i;if(typeof r=="function"&&!c){r=a.createCallback(r,e,2);var l=r(n,t);if(typeof l!="undefined")return!!l}if(n===t)return 0!==n||1/n==1/t;var f=typeof n,p=typeof t;if(n===n&&(!n||"function"!=f&&"object"!=f)&&(!t||"function"!=p&&"object"!=p))return!1;if(null==n||null==t)return n===t;if(p=lr.call(n),f=lr.call(t),p==O&&(p=P),f==O&&(f=P),p!=f)return!1;
-switch(p){case S:case A:return+n==+t;case N:return n!=+n?t!=+t:0==n?1/n==1/t:n==+t;case z:case F:return n==Jt(t)}if(f=p==E,!f){if(ur.call(n,"__wrapped__")||ur.call(t,"__wrapped__"))return it(n.__wrapped__||n,t.__wrapped__||t,r,e,u,o);if(p!=P||!xr.nodeClass&&(W(n)||W(t)))return!1;var p=!xr.argsObject&&et(n)?Gt:n.constructor,s=!xr.argsObject&&et(t)?Gt:t.constructor;if(p!=s&&(!ct(p)||!(p instanceof p&&ct(s)&&s instanceof s)))return!1}for(u||(u=[]),o||(o=[]),p=u.length;p--;)if(u[p]==n)return o[p]==t;
+switch(p){case S:case A:return+n==+t;case N:return n!=+n?t!=+t:0==n?1/n==1/t:n==+t;case z:case F:return n==Jt(t)}if(f=p==E,!f){if(ur.call(n,"__wrapped__")||ur.call(t,"__wrapped__"))return it(n.__wrapped__||n,t.__wrapped__||t,r,e,u,o);if(p!=P||!xr.nodeClass&&(Q(n)||Q(t)))return!1;var p=!xr.argsObject&&et(n)?Gt:n.constructor,s=!xr.argsObject&&et(t)?Gt:t.constructor;if(p!=s&&(!ct(p)||!(p instanceof p&&ct(s)&&s instanceof s)))return!1}for(u||(u=[]),o||(o=[]),p=u.length;p--;)if(u[p]==n)return o[p]==t;
 var g=0,l=!0;if(u.push(n),o.push(t),f){if(p=n.length,g=t.length,l=g==n.length,!l&&!c)return l;for(;g--;)if(f=p,s=t[g],c)for(;f--&&!(l=it(n[f],s,r,e,u,o)););else if(!(l=it(n[g],s,r,e,u,o)))break;return l}return qr(t,function(t,a,i){return ur.call(i,a)?(g++,l=ur.call(n,a)&&it(n[a],t,r,e,u,o)):void 0}),l&&!c&&qr(n,function(n,t,r){return ur.call(r,t)?l=-1<--g:void 0}),l}function ct(n){return typeof n=="function"}function lt(n){return!(!n||!q[typeof n])}function ft(n){return typeof n=="number"||lr.call(n)==N
 }function pt(n){return typeof n=="string"||lr.call(n)==F}function st(n,t,r){var e=arguments,u=0,o=2;if(!lt(n))return n;if(r===i)var c=e[3],l=e[4],f=e[5];else l=[],f=[],typeof r!="number"&&(o=e.length),3<o&&"function"==typeof e[o-2]?c=a.createCallback(e[--o-1],e[o--],2):2<o&&"function"==typeof e[o-1]&&(c=e[--o]);for(;++u<o;)(Ar(e[u])?dt:Dr)(e[u],function(t,r){var e,u,a=t,o=n[r];if(t&&((u=Ar(t))||Rr(t))){for(a=l.length;a--;)if(e=l[a]==t){o=f[a];break}if(!e){var p;c&&(a=c(o,t),p=typeof a!="undefined")&&(o=a),p||(o=u?Ar(o)?o:[]:Rr(o)?o:{}),l.push(t),f.push(o),p||(o=st(o,t,i,c,l,f))
-}}else c&&(a=c(o,t),typeof a=="undefined"&&(a=t)),typeof a!="undefined"&&(o=a);n[r]=o});return n}function gt(n){for(var t=-1,r=Br(n),e=r.length,u=$t(e);++t<e;)u[t]=n[r[t]];return u}function vt(n,t,r){var e=-1,u=Q(),a=n?n.length:0,o=!1;return r=(0>r?yr(0,a+r):r)||0,a&&typeof a=="number"?o=-1<(pt(n)?n.indexOf(t,r):u(n,t,r)):Nr(n,function(n){return++e<r?void 0:!(o=n===t)}),o}function ht(n,t,r){var e=!0;if(t=a.createCallback(t,r),Ar(n)){r=-1;for(var u=n.length;++r<u&&(e=!!t(n[r],r,n)););}else Nr(n,function(n,r,u){return e=!!t(n,r,u)
+}}else c&&(a=c(o,t),typeof a=="undefined"&&(a=t)),typeof a!="undefined"&&(o=a);n[r]=o});return n}function gt(n){for(var t=-1,r=Br(n),e=r.length,u=$t(e);++t<e;)u[t]=n[r[t]];return u}function vt(n,t,r){var e=-1,u=W(),a=n?n.length:0,o=!1;return r=(0>r?yr(0,a+r):r)||0,a&&typeof a=="number"?o=-1<(pt(n)?n.indexOf(t,r):u(n,t,r)):Nr(n,function(n){return++e<r?void 0:!(o=n===t)}),o}function ht(n,t,r){var e=!0;if(t=a.createCallback(t,r),Ar(n)){r=-1;for(var u=n.length;++r<u&&(e=!!t(n[r],r,n)););}else Nr(n,function(n,r,u){return e=!!t(n,r,u)
 });return e}function yt(n,t,r){var e=[];if(t=a.createCallback(t,r),Ar(n)){r=-1;for(var u=n.length;++r<u;){var o=n[r];t(o,r,n)&&e.push(o)}}else Nr(n,function(n,r,u){t(n,r,u)&&e.push(n)});return e}function mt(n,t,r){if(t=a.createCallback(t,r),!Ar(n)){var e;return Nr(n,function(n,r,u){return t(n,r,u)?(e=n,!1):void 0}),e}r=-1;for(var u=n.length;++r<u;){var o=n[r];if(t(o,r,n))return o}}function dt(n,t,r){if(t&&typeof r=="undefined"&&Ar(n)){r=-1;for(var e=n.length;++r<e&&false!==t(n[r],r,n););}else Nr(n,t,r);
 return n}function bt(n,t,r){var e=-1,u=n?n.length:0,o=$t(typeof u=="number"?u:0);if(t=a.createCallback(t,r),Ar(n))for(;++e<u;)o[e]=t(n[e],e,n);else Nr(n,function(n,r,u){o[++e]=t(n,r,u)});return o}function _t(n,t,r){var e=-1/0,u=e;if(!t&&Ar(n)){r=-1;for(var o=n.length;++r<o;){var i=n[r];i>u&&(u=i)}}else t=!t&&pt(n)?L:a.createCallback(t,r),Nr(n,function(n,r,a){r=t(n,r,a),r>e&&(e=r,u=n)});return u}function Ct(n,t,r,e){var u=3>arguments.length;if(t=a.createCallback(t,e,4),Ar(n)){var o=-1,i=n.length;for(u&&(r=n[++o]);++o<i;)r=t(r,n[o],o,n)
 }else Nr(n,function(n,e,a){r=u?(u=!1,n):t(r,n,e,a)});return r}function jt(n,t,r,e){var u=n,o=n?n.length:0,i=3>arguments.length;if(typeof o!="number")var c=Br(n),o=c.length;else xr.unindexedChars&&pt(n)&&(u=n.split(""));return t=a.createCallback(t,e,4),dt(n,function(n,e,a){e=c?c[--o]:--o,r=i?(i=!1,u[e]):t(r,u[e],e,a)}),r}function wt(n,t,r){var e;if(t=a.createCallback(t,r),Ar(n)){r=-1;for(var u=n.length;++r<u&&!(e=t(n[r],r,n)););}else Nr(n,function(n,r,u){return!(e=t(n,r,u))});return!!e}function kt(n){for(var t=-1,r=n?n.length:0,e=nr.apply(Mt,_r.call(arguments,1)),e=J(e).contains,u=[];++t<r;){var a=n[t];
 e(a)||u.push(a)}return u}function xt(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&null!=t){var o=-1;for(t=a.createCallback(t,r);++o<u&&t(n[o],o,n);)e++}else if(e=t,null==e||r)return n[0];return tt(n,0,mr(yr(0,e),u))}}function Ot(n,t,r){if(typeof r=="number"){var e=n?n.length:0;r=0>r?yr(0,e+r):r||0}else if(r)return r=St(n,t),n[r]===t?r:-1;return n?T(n,t,r):-1}function Et(n,t,r){if(typeof t!="number"&&null!=t){var e=0,u=-1,o=n?n.length:0;for(t=a.createCallback(t,r);++u<o&&t(n[u],u,n);)e++
 }else e=null==t||r?1:yr(0,t);return tt(n,e)}function St(n,t,r,e){var u=0,o=n?n.length:u;for(r=r?a.createCallback(r,e,1):Pt,t=r(t);u<o;)e=u+o>>>1,r(n[e])<t?u=e+1:o=e;return u}function At(n){for(var t=-1,r=n?_t(Tr(n,"length")):0,e=$t(0>r?0:r);++t<r;)e[t]=Tr(n,t);return e}function It(n,t){for(var r=-1,e=n?n.length:0,u={};++r<e;){var a=n[r];t?u[a]=t[r]:u[a[0]]=a[1]}return u}function Bt(n,t){return xr.fastBind||fr&&2<arguments.length?fr.call.apply(fr,arguments):H(n,t,_r.call(arguments,2))}function Nt(n){var t=_r.call(arguments,1);
-return cr(function(){n.apply(r,t)},1)}function Pt(n){return n}function zt(n){dt(at(n),function(t){var r=a[t]=n[t];a.prototype[t]=function(){var n=this.__wrapped__,t=[n];return ar.apply(t,arguments),t=r.apply(a,t),n&&typeof n=="object"&&n==t?this:new X(t)}})}function Ft(){return this.__wrapped__}e=e?R.defaults(n.Object(),e,R.pick(n,w)):n;var $t=e.Array,qt=e.Boolean,Dt=e.Date,Rt=e.Function,Tt=e.Math,Lt=e.Number,Gt=e.Object,Ht=e.RegExp,Jt=e.String,Kt=e.TypeError,Mt=$t.prototype,Ut=e.Error.prototype,Vt=Gt.prototype,Qt=Jt.prototype,Wt=e._,Xt=Ht("^"+Jt(Vt.valueOf).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/valueOf|for [^\]]+/g,".+?")+"$"),Yt=Tt.ceil,Zt=e.clearTimeout,nr=Mt.concat,tr=Tt.floor,rr=Rt.prototype.toString,er=Xt.test(er=Gt.getPrototypeOf)&&er,ur=Vt.hasOwnProperty,ar=Mt.push,or=Vt.propertyIsEnumerable,ir=e.setImmediate,cr=e.setTimeout,lr=Vt.toString,fr=Xt.test(fr=lr.bind)&&fr,pr=Xt.test(pr=Gt.create)&&pr,sr=Xt.test(sr=$t.isArray)&&sr,gr=e.isFinite,vr=e.isNaN,hr=Xt.test(hr=Gt.keys)&&hr,yr=Tt.max,mr=Tt.min,dr=e.parseInt,br=Tt.random,_r=Mt.slice,Cr=Xt.test(e.attachEvent),jr=fr&&!/\n|true/.test(fr+Cr),wr={};
+return cr(function(){n.apply(r,t)},1)}function Pt(n){return n}function zt(n){dt(at(n),function(t){var r=a[t]=n[t];a.prototype[t]=function(){var n=this.__wrapped__,t=[n];return ar.apply(t,arguments),t=r.apply(a,t),n&&typeof n=="object"&&n==t?this:new X(t)}})}function Ft(){return this.__wrapped__}e=e?R.defaults(n.Object(),e,R.pick(n,w)):n;var $t=e.Array,qt=e.Boolean,Dt=e.Date,Rt=e.Function,Tt=e.Math,Lt=e.Number,Gt=e.Object,Ht=e.RegExp,Jt=e.String,Kt=e.TypeError,Mt=$t.prototype,Ut=e.Error.prototype,Vt=Gt.prototype,Wt=Jt.prototype,Qt=e._,Xt=Ht("^"+Jt(Vt.valueOf).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/valueOf|for [^\]]+/g,".+?")+"$"),Yt=Tt.ceil,Zt=e.clearTimeout,nr=Mt.concat,tr=Tt.floor,rr=Rt.prototype.toString,er=Xt.test(er=Gt.getPrototypeOf)&&er,ur=Vt.hasOwnProperty,ar=Mt.push,or=Vt.propertyIsEnumerable,ir=e.setImmediate,cr=e.setTimeout,lr=Vt.toString,fr=Xt.test(fr=lr.bind)&&fr,pr=Xt.test(pr=Gt.create)&&pr,sr=Xt.test(sr=$t.isArray)&&sr,gr=e.isFinite,vr=e.isNaN,hr=Xt.test(hr=Gt.keys)&&hr,yr=Tt.max,mr=Tt.min,dr=e.parseInt,br=Tt.random,_r=Mt.slice,Cr=Xt.test(e.attachEvent),jr=fr&&!/\n|true/.test(fr+Cr),wr={};
 wr[E]=$t,wr[S]=qt,wr[A]=Dt,wr[B]=Rt,wr[P]=Gt,wr[N]=Lt,wr[z]=Ht,wr[F]=Jt;var kr={};kr[E]=kr[A]=kr[N]={constructor:!0,toLocaleString:!0,toString:!0,valueOf:!0},kr[S]=kr[F]={constructor:!0,toString:!0,valueOf:!0},kr[I]=kr[B]=kr[z]={constructor:!0,toString:!0},kr[P]={constructor:!0},function(){for(var n=x.length;n--;){var t,r=x[n];for(t in kr)ur.call(kr,t)&&!ur.call(kr[t],r)&&(kr[t][r]=!1)}}();var xr=a.support={};!function(){var n=function(){this.x=1},t={0:1,length:1},r=[];n.prototype={valueOf:1,y:1};
 for(var e in new n)r.push(e);for(e in arguments);xr.argsObject=arguments.constructor==Gt&&!(arguments instanceof $t),xr.argsClass=et(arguments),xr.enumErrorProps=or.call(Ut,"message")||or.call(Ut,"name"),xr.enumPrototypes=or.call(n,"prototype"),xr.fastBind=fr&&!jr,xr.ownLast="x"!=r[0],xr.nonEnumArgs=0!=e,xr.nonEnumShadows=!/valueOf/.test(r),xr.spliceObjects=(Mt.splice.call(t,0,1),!t[0]),xr.unindexedChars="xx"!="x"[0]+Gt("x")[0];try{xr.nodeClass=!(lr.call(document)==P&&!({toString:0}+""))}catch(u){xr.nodeClass=!0
 }}(1),a.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:y,variable:"",imports:{_:a}};var Or={a:"x,F,k",h:"var a=arguments,b=0,c=typeof k=='number'?2:a.length;while(++b<c){r=a[b];if(r&&z[typeof r]){",f:"if(typeof C[m]=='undefined')C[m]=r[m]",c:"}}"},Er={a:"f,d,I",h:"d=d&&typeof I=='undefined'?d:u.createCallback(d,I)",b:"typeof s=='number'",f:"if(d(r[m],m,f)===false)return C"},Sr={h:"if(!z[typeof r])return C;"+Er.h,b:!1};pr||(M=function(n){if(lt(n)){Y.prototype=n;
 var t=new Y;Y.prototype=null}return t||{}}),X.prototype=a.prototype,xr.argsClass||(et=function(n){return n?ur.call(n,"callee"):!1});var Ar=sr||function(n){return n?typeof n=="object"&&lr.call(n)==E:!1},Ir=K({a:"x",e:"[]",h:"if(!(z[typeof x]))return C",f:"C.push(m)"}),Br=hr?function(n){return lt(n)?xr.enumPrototypes&&typeof n=="function"||xr.nonEnumArgs&&n.length&&et(n)?Ir(n):hr(n):[]}:Ir,Nr=K(Er),Pr={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"},zr=ot(Pr),Fr=K(Or,{h:Or.h.replace(";",";if(c>3&&typeof a[c-2]=='function'){var d=u.createCallback(a[--c-1],a[c--],2)}else if(c>2&&typeof a[c-1]=='function'){d=a[--c]}"),f:"C[m]=d?d(C[m],r[m]):r[m]"}),$r=K(Or),qr=K(Er,Sr,{i:!1}),Dr=K(Er,Sr);
-ct(/x/)&&(ct=function(n){return typeof n=="function"&&lr.call(n)==B});var Rr=er?function(n){if(!n||lr.call(n)!=P||!xr.argsClass&&et(n))return!1;var t=n.valueOf,r=typeof t=="function"&&(r=er(t))&&er(r);return r?n==r||er(n)==r:nt(n)}:nt,Tr=bt,Lr=Z(function Jr(n,t,r){for(var e=-1,u=n?n.length:0,a=[];++e<u;){var o=n[e];r&&(o=r(o,e,n)),Ar(o)?ar.apply(a,t?o:Jr(o)):a.push(o)}return a}),Gr=Z(function(n,t,r){for(var e=-1,u=Q(),a=n?n.length:0,o=!t&&a>=l,i=[],c=o?J():r?[]:i;++e<a;){var f=n[e],p=r?r(f,e,n):f;
+ct(/x/)&&(ct=function(n){return typeof n=="function"&&lr.call(n)==B});var Rr=er?function(n){if(!n||lr.call(n)!=P||!xr.argsClass&&et(n))return!1;var t=n.valueOf,r=typeof t=="function"&&(r=er(t))&&er(r);return r?n==r||er(n)==r:nt(n)}:nt,Tr=bt,Lr=Z(function Jr(n,t,r){for(var e=-1,u=n?n.length:0,a=[];++e<u;){var o=n[e];r&&(o=r(o,e,n)),Ar(o)?ar.apply(a,t?o:Jr(o)):a.push(o)}return a}),Gr=Z(function(n,t,r){for(var e=-1,u=W(),a=n?n.length:0,o=!t&&a>=l,i=[],c=o?J():r?[]:i;++e<a;){var f=n[e],p=r?r(f,e,n):f;
 (t?e&&c[c.length-1]===p:o?c.contains(p):0<=u(c,p))||((r||o)&&c.push(p),i.push(f))}return i});jr&&u&&typeof ir=="function"&&(Nt=Bt(ir,e));var Hr=8==dr(d+"08")?dr:function(n,t){return dr(pt(n)?n.replace(b,""):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=Fr,a.at=function(n){var t=-1,r=nr.apply(Mt,_r.call(arguments,1)),e=r.length,u=$t(e);for(xr.unindexedChars&&pt(n)&&(n=n.split(""));++t<e;)u[t]=n[r[t]];return u},a.bind=Bt,a.bindAll=function(n){for(var t=1<arguments.length?nr.apply(Mt,_r.call(arguments,1)):at(n),r=-1,e=t.length;++r<e;){var u=t[r];
 n[u]=Bt(n[u],n)}return n},a.bindKey=function(n,t){return H(n,t,_r.call(arguments,2),i)},a.compact=function(n){for(var t=-1,r=n?n.length:0,e=[];++t<r;){var u=n[t];u&&e.push(u)}return e},a.compose=function(){var n=arguments;return function(){for(var t=arguments,r=n.length;r--;)t=[n[r].apply(this,t)];return t[0]}},a.countBy=function(n,t,r){var e={};return t=a.createCallback(t,r),dt(n,function(n,r,u){r=Jt(t(n,r,u)),ur.call(e,r)?e[r]++:e[r]=1}),e},a.createCallback=function(n,t,r){if(null==n)return Pt;
 var e=typeof n;if("function"!=e){if("object"!=e)return function(t){return t[n]};var u=Br(n);return function(t){for(var r=u.length,e=!1;r--&&(e=it(t[u[r]],n[u[r]],i)););return e}}return typeof t=="undefined"||m&&!m.test(rr.call(n))?n:1===r?function(r){return n.call(t,r)}:2===r?function(r,e){return n.call(t,r,e)}:4===r?function(r,e,u,a){return n.call(t,r,e,u,a)}:function(r,e,u){return n.call(t,r,e,u)}},a.debounce=function(n,t,r){function e(){var t=l&&(!f||1<i);i=c=0,t&&(a=n.apply(o,u))}var u,a,o,i=0,c=null,l=!0;
 if(true===r)var f=!0,l=!1;else lt(r)&&(f=r.leading,l="trailing"in r?r.trailing:l);return function(){return u=arguments,o=this,Zt(c),f&&2>++i&&(a=n.apply(o,u)),c=cr(e,t),a}},a.defaults=$r,a.defer=Nt,a.delay=function(n,t){var e=_r.call(arguments,2);return cr(function(){n.apply(r,e)},t)},a.difference=kt,a.filter=yt,a.flatten=Lr,a.forEach=dt,a.forIn=qr,a.forOwn=Dr,a.functions=at,a.groupBy=function(n,t,r){var e={};return t=a.createCallback(t,r),dt(n,function(n,r,u){r=Jt(t(n,r,u)),(ur.call(e,r)?e[r]:e[r]=[]).push(n)
 }),e},a.initial=function(n,t,r){if(!n)return[];var e=0,u=n.length;if(typeof t!="number"&&null!=t){var o=u;for(t=a.createCallback(t,r);o--&&t(n[o],o,n);)e++}else e=null==t||r?1:t||e;return tt(n,0,mr(yr(0,u-e),u))},a.intersection=function(n){var t=arguments,r=t.length,e=J(),u={},a=-1,o=n?n.length:0,i=[];n:for(;++a<o;){var c=n[a];if(!e.contains(c)){var l=r;for(e.push(c);--l;)if(!(u[l]||(u[l]=J(t[l]).contains))(c))continue n;i.push(c)}}return i},a.invert=ot,a.invoke=function(n,t){var r=_r.call(arguments,2),e=-1,u=typeof t=="function",a=n?n.length:0,o=$t(typeof a=="number"?a:0);
-return dt(n,function(n){o[++e]=(u?t:n[t]).apply(n,r)}),o},a.keys=Br,a.map=bt,a.max=_t,a.memoize=function(n,t){function r(){var e=r.cache,u=c+(t?t.apply(this,arguments):arguments[0]);return ur.call(e,u)?e[u]:e[u]=n.apply(this,arguments)}return r.cache={},r},a.merge=st,a.min=function(n,t,r){var e=1/0,u=e;if(!t&&Ar(n)){r=-1;for(var o=n.length;++r<o;){var i=n[r];i<u&&(u=i)}}else t=!t&&pt(n)?L:a.createCallback(t,r),Nr(n,function(n,r,a){r=t(n,r,a),r<e&&(e=r,u=n)});return u},a.omit=function(n,t,r){var e=Q(),u=typeof t=="function",o={};
+return dt(n,function(n){o[++e]=(u?t:n[t]).apply(n,r)}),o},a.keys=Br,a.map=bt,a.max=_t,a.memoize=function(n,t){function r(){var e=r.cache,u=c+(t?t.apply(this,arguments):arguments[0]);return ur.call(e,u)?e[u]:e[u]=n.apply(this,arguments)}return r.cache={},r},a.merge=st,a.min=function(n,t,r){var e=1/0,u=e;if(!t&&Ar(n)){r=-1;for(var o=n.length;++r<o;){var i=n[r];i<u&&(u=i)}}else t=!t&&pt(n)?L:a.createCallback(t,r),Nr(n,function(n,r,a){r=t(n,r,a),r<e&&(e=r,u=n)});return u},a.omit=function(n,t,r){var e=W(),u=typeof t=="function",o={};
 if(u)t=a.createCallback(t,r);else var i=nr.apply(Mt,_r.call(arguments,1));return qr(n,function(n,r,a){(u?!t(n,r,a):0>e(i,r))&&(o[r]=n)}),o},a.once=function(n){var t,r;return function(){return t?r:(t=!0,r=n.apply(this,arguments),n=null,r)}},a.pairs=function(n){for(var t=-1,r=Br(n),e=r.length,u=$t(e);++t<e;){var a=r[t];u[t]=[a,n[a]]}return u},a.partial=function(n){return H(n,_r.call(arguments,1))},a.partialRight=function(n){return H(n,_r.call(arguments,1),null,i)},a.pick=function(n,t,r){var e={};if(typeof t!="function")for(var u=-1,o=nr.apply(Mt,_r.call(arguments,1)),i=lt(n)?o.length:0;++u<i;){var c=o[u];
 c in n&&(e[c]=n[c])}else t=a.createCallback(t,r),qr(n,function(n,r,u){t(n,r,u)&&(e[r]=n)});return e},a.pluck=Tr,a.range=function(n,t,r){n=+n||0,r=+r||1,null==t&&(t=n,n=0);var e=-1;t=yr(0,Yt((t-n)/r));for(var u=$t(t);++e<t;)u[e]=n,n+=r;return u},a.reject=function(n,t,r){return t=a.createCallback(t,r),yt(n,function(n,r,e){return!t(n,r,e)})},a.rest=Et,a.shuffle=function(n){var t=-1,r=n?n.length:0,e=$t(typeof r=="number"?r:0);return dt(n,function(n){var r=tr(br()*(++t+1));e[t]=e[r],e[r]=n}),e},a.sortBy=function(n,t,r){var e=-1,u=n?n.length:0,o=$t(typeof u=="number"?u:0);
 for(t=a.createCallback(t,r),dt(n,function(n,r,u){o[++e]={a:t(n,r,u),b:e,c:n}}),u=o.length,o.sort(G);u--;)o[u]=o[u].c;return o},a.tap=function(n,t){return t(n),n},a.throttle=function(n,t,r){function e(){l=null,f&&(i=new Dt,a=n.apply(o,u))}var u,a,o,i=0,c=!0,l=null,f=!0;return false===r?c=!1:lt(r)&&(c="leading"in r?r.leading:c,f="trailing"in r?r.trailing:f),function(){var r=new Dt;!l&&!c&&(i=r);var f=t-(r-i);return u=arguments,o=this,0<f?l||(l=cr(e,f)):(Zt(l),l=null,i=r,a=n.apply(o,u)),a}},a.times=function(n,t,r){n=-1<(n=+n)?n:0;
@@ -40,10 +40,10 @@ var e=-1,u=$t(n);for(t=a.createCallback(t,r,1);++e<n;)u[e]=t(e);return u},a.toAr
 },a.wrap=function(n,t){return function(){var r=[n];return ar.apply(r,arguments),t.apply(this,r)}},a.zip=function(n){return n?At(arguments):[]},a.zipObject=It,a.collect=bt,a.drop=Et,a.each=dt,a.extend=Fr,a.methods=at,a.object=It,a.select=yt,a.tail=Et,a.unique=Gr,zt(a),a.chain=a,a.prototype.chain=function(){return this},a.clone=ut,a.cloneDeep=function(n,t,r){return ut(n,!0,t,r)},a.contains=vt,a.escape=function(n){return null==n?"":Jt(n).replace(C,U)},a.every=ht,a.find=mt,a.findIndex=function(n,t,r){var e=-1,u=n?n.length:0;
 for(t=a.createCallback(t,r);++e<u;)if(t(n[e],e,n))return e;return-1},a.findKey=function(n,t,r){var e;return t=a.createCallback(t,r),Dr(n,function(n,r,u){return t(n,r,u)?(e=r,!1):void 0}),e},a.has=function(n,t){return n?ur.call(n,t):!1},a.identity=Pt,a.indexOf=Ot,a.isArguments=et,a.isArray=Ar,a.isBoolean=function(n){return true===n||false===n||lr.call(n)==S},a.isDate=function(n){return n?typeof n=="object"&&lr.call(n)==A:!1},a.isElement=function(n){return n?1===n.nodeType:!1},a.isEmpty=function(n){var t=!0;
 if(!n)return t;var r=lr.call(n),e=n.length;return r==E||r==F||(xr.argsClass?r==O:et(n))||r==P&&typeof e=="number"&&ct(n.splice)?!e:(Dr(n,function(){return t=!1}),t)},a.isEqual=it,a.isFinite=function(n){return gr(n)&&!vr(parseFloat(n))},a.isFunction=ct,a.isNaN=function(n){return ft(n)&&n!=+n},a.isNull=function(n){return null===n},a.isNumber=ft,a.isObject=lt,a.isPlainObject=Rr,a.isRegExp=function(n){return!(!n||!q[typeof n])&&lr.call(n)==z},a.isString=pt,a.isUndefined=function(n){return typeof n=="undefined"
-},a.lastIndexOf=function(n,t,r){var e=n?n.length:0;for(typeof r=="number"&&(e=(0>r?yr(0,e+r):mr(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},a.mixin=zt,a.noConflict=function(){return e._=Wt,this},a.parseInt=Hr,a.random=function(n,t){null==n&&null==t&&(t=1),n=+n||0,null==t?(t=n,n=0):t=+t||0;var r=br();return n%1||t%1?n+mr(r*(t-n+parseFloat("1e-"+((r+"").length-1))),t):n+tr(r*(t-n+1))},a.reduce=Ct,a.reduceRight=jt,a.result=function(n,t){var e=n?n[t]:r;return ct(e)?n[t]():e},a.runInContext=t,a.size=function(n){var t=n?n.length:0;
+},a.lastIndexOf=function(n,t,r){var e=n?n.length:0;for(typeof r=="number"&&(e=(0>r?yr(0,e+r):mr(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},a.mixin=zt,a.noConflict=function(){return e._=Qt,this},a.parseInt=Hr,a.random=function(n,t){null==n&&null==t&&(t=1),n=+n||0,null==t?(t=n,n=0):t=+t||0;var r=br();return n%1||t%1?n+mr(r*(t-n+parseFloat("1e-"+((r+"").length-1))),t):n+tr(r*(t-n+1))},a.reduce=Ct,a.reduceRight=jt,a.result=function(n,t){var e=n?n[t]:r;return ct(e)?n[t]():e},a.runInContext=t,a.size=function(n){var t=n?n.length:0;
 return typeof t=="number"?t:Br(n).length},a.some=wt,a.sortedIndex=St,a.template=function(n,t,e){var u=a.templateSettings;n||(n=""),e=$r({},e,u);var o,i=$r({},e.imports,u.imports),u=Br(i),i=gt(i),c=0,l=e.interpolate||_,g="__p+='",l=Ht((e.escape||_).source+"|"+l.source+"|"+(l===y?v:_).source+"|"+(e.evaluate||_).source+"|$","g");n.replace(l,function(t,r,e,u,a,i){return e||(e=u),g+=n.slice(c,i).replace(j,V),r&&(g+="'+__e("+r+")+'"),a&&(o=!0,g+="';"+a+";__p+='"),e&&(g+="'+((__t=("+e+"))==null?'':__t)+'"),c=i+t.length,t
 }),g+="';\n",l=e=e.variable,l||(e="obj",g="with("+e+"){"+g+"}"),g=(o?g.replace(f,""):g).replace(p,"$1").replace(s,"$1;"),g="function("+e+"){"+(l?"":e+"||("+e+"={});")+"var __t,__p='',__e=_.escape"+(o?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+g+"return __p}";try{var h=Rt(u,"return "+g).apply(r,i)}catch(m){throw m.source=g,m}return t?h(t):(h.source=g,h)},a.unescape=function(n){return null==n?"":Jt(n).replace(g,rt)},a.uniqueId=function(n){var t=++o;return Jt(null==n?"":n)+t
-},a.all=ht,a.any=wt,a.detect=mt,a.foldl=Ct,a.foldr=jt,a.include=vt,a.inject=Ct,Dr(a,function(n,t){a.prototype[t]||(a.prototype[t]=function(){var t=[this.__wrapped__];return ar.apply(t,arguments),n.apply(a,t)})}),a.first=xt,a.last=function(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&null!=t){var o=u;for(t=a.createCallback(t,r);o--&&t(n[o],o,n);)e++}else if(e=t,null==e||r)return n[u-1];return tt(n,yr(0,u-e))}},a.take=xt,a.head=xt,Dr(a,function(n,t){a.prototype[t]||(a.prototype[t]=function(t,r){var e=n(this.__wrapped__,t,r);
+},a.all=ht,a.any=wt,a.detect=mt,a.findWhere=mt,a.foldl=Ct,a.foldr=jt,a.include=vt,a.inject=Ct,Dr(a,function(n,t){a.prototype[t]||(a.prototype[t]=function(){var t=[this.__wrapped__];return ar.apply(t,arguments),n.apply(a,t)})}),a.first=xt,a.last=function(n,t,r){if(n){var e=0,u=n.length;if(typeof t!="number"&&null!=t){var o=u;for(t=a.createCallback(t,r);o--&&t(n[o],o,n);)e++}else if(e=t,null==e||r)return n[u-1];return tt(n,yr(0,u-e))}},a.take=xt,a.head=xt,Dr(a,function(n,t){a.prototype[t]||(a.prototype[t]=function(t,r){var e=n(this.__wrapped__,t,r);
 return null==t||r&&typeof t!="function"?e:new X(e)})}),a.VERSION="1.2.1",a.prototype.toString=function(){return Jt(this.__wrapped__)},a.prototype.value=Ft,a.prototype.valueOf=Ft,Nr(["join","pop","shift"],function(n){var t=Mt[n];a.prototype[n]=function(){return t.apply(this.__wrapped__,arguments)}}),Nr(["push","reverse","sort","unshift"],function(n){var t=Mt[n];a.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),Nr(["concat","slice","splice"],function(n){var t=Mt[n];a.prototype[n]=function(){return new X(t.apply(this.__wrapped__,arguments))
 }}),xr.spliceObjects||Nr(["pop","shift","splice"],function(n){var t=Mt[n],r="splice"==n;a.prototype[n]=function(){var n=this.__wrapped__,e=t.apply(n,arguments);return 0===n.length&&delete n[0],r?new X(e):e}}),a}var r,e=typeof exports=="object"&&exports,u=typeof module=="object"&&module&&module.exports==e&&module,a=typeof global=="object"&&global;(a.global===a||a.window===a)&&(n=a);var o=0,i={},c=+new Date+"",l=75,f=/\b__p\+='';/g,p=/\b(__p\+=)''\+/g,s=/(__e\(.*?\)|\b__t\))\+'';/g,g=/&(?:amp|lt|gt|quot|#39);/g,v=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,h=/\w*$/,y=/<%=([\s\S]+?)%>/g,m=(m=/\bthis\b/)&&m.test(t)&&m,d=" \t\x0B\f\xa0\ufeff\n\r\u2028\u2029\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000",b=RegExp("^["+d+"]*0+(?=.$)"),_=/($^)/,C=/[&<>"']/g,j=/['\n\r\t\u2028\u2029\\]/g,w="Array Boolean Date Error Function Math Number Object RegExp String _ attachEvent clearTimeout isFinite isNaN parseInt setImmediate setTimeout".split(" "),x="constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" "),O="[object Arguments]",E="[object Array]",S="[object Boolean]",A="[object Date]",I="[object Error]",B="[object Function]",N="[object Number]",P="[object Object]",z="[object RegExp]",F="[object String]",$={};
 $[B]=!1,$[O]=$[E]=$[S]=$[A]=$[N]=$[P]=$[z]=$[F]=!0;var q={"boolean":!1,"function":!0,object:!0,number:!1,string:!1,undefined:!1},D={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},R=t();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(n._=R, define(function(){return R})):e&&!e.nodeType?u?(u.exports=R)._=R:e._=R:n._=R}(this);

dist/lodash.js

@@ -2401,7 +2401,7 @@
      *
      * @static
      * @memberOf _
-     * @alias detect
+     * @alias detect, findWhere
      * @category Collections
      * @param {Array|Object|String} collection The collection to iterate over.
      * @param {Function|Object|String} [callback=identity] The function called per
@@ -5207,7 +5207,7 @@
     // add functions to `lodash.prototype`
     mixin(lodash);
 
-    // add Underscore `_.chain` compat
+    // add Underscore compat
     lodash.chain = lodash;
     lodash.prototype.chain = function() { return this; };
 
@@ -5262,6 +5262,7 @@
     lodash.all = every;
     lodash.any = some;
     lodash.detect = find;
+    lodash.findWhere = find;
     lodash.foldl = reduce;
     lodash.foldr = reduceRight;
     lodash.include = contains;

dist/lodash.min.js

@@ -4,41 +4,41 @@
  * Build: `lodash modern -o ./dist/lodash.js`
  * Underscore.js 1.4.4 underscorejs.org/LICENSE
  */
-;!function(n){function t(o){function f(n){if(!n||fe.call(n)!=B)return a;var t=n.valueOf,e=typeof t=="function"&&(e=re(t))&&re(e);return e?n==e||re(n)==e:et(n)}function P(n,t,e){if(!n||!q[typeof n])return n;t=t&&typeof e=="undefined"?t:G.createCallback(t,e);for(var r=-1,u=q[typeof n]?xe(n):[],a=u.length;++r<a&&(e=u[r],!(t(n[e],e,n)===false)););return n}function K(n,t,e){var r;if(!n||!q[typeof n])return n;t=t&&typeof e=="undefined"?t:G.createCallback(t,e);for(r in n)if(t(n[r],r,n)===false)break;return n}function M(n,t,e){var r,u=n,a=u;
-if(!u)return a;for(var o=arguments,i=0,f=typeof e=="number"?2:o.length;++i<f;)if((u=o[i])&&q[typeof u])for(var c=-1,l=q[typeof u]?xe(u):[],p=l.length;++c<p;)r=l[c],"undefined"==typeof a[r]&&(a[r]=u[r]);return a}function U(n,t,e){var r,u=n,a=u;if(!u)return a;var o=arguments,i=0,f=typeof e=="number"?2:o.length;if(3<f&&"function"==typeof o[f-2])var c=G.createCallback(o[--f-1],o[f--],2);else 2<f&&"function"==typeof o[f-1]&&(c=o[--f]);for(;++i<f;)if((u=o[i])&&q[typeof u])for(var l=-1,p=q[typeof u]?xe(u):[],s=p.length;++l<s;)r=p[l],a[r]=c?c(a[r],u[r]):u[r];
-return a}function V(n){var t,e=[];if(!n||!q[typeof n])return e;for(t in n)ue.call(n,t)&&e.push(t);return e}function G(n){return n&&typeof n=="object"&&!Ce(n)&&ue.call(n,"__wrapped__")?n:new nt(n)}function H(n,t,e){e=(e||0)-1;for(var r=n.length;++e<r;)if(n[e]===t)return e;return-1}function J(n){return n.charCodeAt(0)}function L(n,t){var e=n.b,r=t.b;if(n=n.a,t=t.a,n!==t){if(n>t||typeof n=="undefined")return 1;if(n<t||typeof t=="undefined")return-1}return e<r?-1:1}function Q(n,t,e,r){function u(){var r=arguments,c=o?this:t;
-return a||(n=t[i]),e.length&&(r=r.length?(r=de.call(r),f?r.concat(e):e.concat(r)):e),this instanceof u?(c=lt(n.prototype)?le(n.prototype):{},r=n.apply(c,r),lt(r)?r:c):n.apply(c,r)}var a=ct(n),o=!e,i=t;if(o){var f=r;e=t}else if(!a){if(!r)throw new Jt;t=n}return u}function W(n){function t(t){return-1<l(n,t)}function e(t){n.push(t)}function o(n){var t=typeof n;if("boolean"==t||n==u)return h[n];var e=h[t]||(t="object",y),r="number"==t?n:p+n;return"object"==t?e[r]?-1<H(e[r],n):a:!!e[r]}function i(n){var t=typeof n;
-if("boolean"==t||n==u)h[n]=r;else{var e=h[t]||(t="object",y),a="number"==t?n:p+n;"object"==t?f=(e[a]||(e[a]=[])).push(n)==v:e[a]=r}}n||(n=[]);var f,c=-1,l=Z(),v=n.length,g=v>=s&&G.indexOf!=l,y={},h={"false":a,"function":a,"null":a,number:{},object:y,string:{},"true":a,undefined:a};if(g){for(;++c<v;)i(n[c]);f&&(g=h=y=u)}return g?{contains:o,push:i}:{contains:t,push:e}}function X(n){return Oe[n]}function Y(n){return"\\"+D[n]}function Z(){var n=(n=G.indexOf)==St?H:n;return n}function nt(n){this.__wrapped__=n
-}function tt(n){return function(t,r,o,i){return typeof r!="boolean"&&r!=u&&(i=o,o=i&&i[r]===t?e:r,r=a),o!=u&&(o=G.createCallback(o,i)),n(t,r,o,i)}}function et(n){var t,r;return n&&fe.call(n)==B&&(t=n.constructor,!ct(t)||t instanceof t)?(K(n,function(n,t){r=t}),r===e||ue.call(n,r)):a}function rt(n,t,e){t||(t=0),typeof e=="undefined"&&(e=n?n.length:0);var r=-1;e=e-t||0;for(var u=Dt(0>e?0:e);++r<e;)u[r]=n[t+r];return u}function ut(n){return Ee[n]}function at(n,t,r,o,i,f){var c=n;if(typeof t!="boolean"&&t!=u&&(o=r,r=t,t=a),typeof r=="function"){if(r=typeof o=="undefined"?r:G.createCallback(r,o,1),c=r(c),typeof c!="undefined")return c;
+;!function(n){function t(o){function f(n){if(!n||fe.call(n)!=B)return a;var t=n.valueOf,e=typeof t=="function"&&(e=re(t))&&re(e);return e?n==e||re(n)==e:et(n)}function P(n,t,e){if(!n||!q[typeof n])return n;t=t&&typeof e=="undefined"?t:W.createCallback(t,e);for(var r=-1,u=q[typeof n]?xe(n):[],a=u.length;++r<a&&(e=u[r],!(t(n[e],e,n)===false)););return n}function K(n,t,e){var r;if(!n||!q[typeof n])return n;t=t&&typeof e=="undefined"?t:W.createCallback(t,e);for(r in n)if(t(n[r],r,n)===false)break;return n}function M(n,t,e){var r,u=n,a=u;
+if(!u)return a;for(var o=arguments,i=0,f=typeof e=="number"?2:o.length;++i<f;)if((u=o[i])&&q[typeof u])for(var c=-1,l=q[typeof u]?xe(u):[],p=l.length;++c<p;)r=l[c],"undefined"==typeof a[r]&&(a[r]=u[r]);return a}function U(n,t,e){var r,u=n,a=u;if(!u)return a;var o=arguments,i=0,f=typeof e=="number"?2:o.length;if(3<f&&"function"==typeof o[f-2])var c=W.createCallback(o[--f-1],o[f--],2);else 2<f&&"function"==typeof o[f-1]&&(c=o[--f]);for(;++i<f;)if((u=o[i])&&q[typeof u])for(var l=-1,p=q[typeof u]?xe(u):[],s=p.length;++l<s;)r=p[l],a[r]=c?c(a[r],u[r]):u[r];
+return a}function V(n){var t,e=[];if(!n||!q[typeof n])return e;for(t in n)ue.call(n,t)&&e.push(t);return e}function W(n){return n&&typeof n=="object"&&!Ce(n)&&ue.call(n,"__wrapped__")?n:new nt(n)}function G(n,t,e){e=(e||0)-1;for(var r=n.length;++e<r;)if(n[e]===t)return e;return-1}function H(n){return n.charCodeAt(0)}function J(n,t){var e=n.b,r=t.b;if(n=n.a,t=t.a,n!==t){if(n>t||typeof n=="undefined")return 1;if(n<t||typeof t=="undefined")return-1}return e<r?-1:1}function L(n,t,e,r){function u(){var r=arguments,c=o?this:t;
+return a||(n=t[i]),e.length&&(r=r.length?(r=de.call(r),f?r.concat(e):e.concat(r)):e),this instanceof u?(c=lt(n.prototype)?le(n.prototype):{},r=n.apply(c,r),lt(r)?r:c):n.apply(c,r)}var a=ct(n),o=!e,i=t;if(o){var f=r;e=t}else if(!a){if(!r)throw new Ht;t=n}return u}function Q(n){function t(t){return-1<l(n,t)}function e(t){n.push(t)}function o(n){var t=typeof n;if("boolean"==t||n==u)return h[n];var e=h[t]||(t="object",y),r="number"==t?n:p+n;return"object"==t?e[r]?-1<G(e[r],n):a:!!e[r]}function i(n){var t=typeof n;
+if("boolean"==t||n==u)h[n]=r;else{var e=h[t]||(t="object",y),a="number"==t?n:p+n;"object"==t?f=(e[a]||(e[a]=[])).push(n)==v:e[a]=r}}n||(n=[]);var f,c=-1,l=Z(),v=n.length,g=v>=s&&W.indexOf!=l,y={},h={"false":a,"function":a,"null":a,number:{},object:y,string:{},"true":a,undefined:a};if(g){for(;++c<v;)i(n[c]);f&&(g=h=y=u)}return g?{contains:o,push:i}:{contains:t,push:e}}function X(n){return Oe[n]}function Y(n){return"\\"+D[n]}function Z(){var n=(n=W.indexOf)==St?G:n;return n}function nt(n){this.__wrapped__=n
+}function tt(n){return function(t,r,o,i){return typeof r!="boolean"&&r!=u&&(i=o,o=i&&i[r]===t?e:r,r=a),o!=u&&(o=W.createCallback(o,i)),n(t,r,o,i)}}function et(n){var t,r;return n&&fe.call(n)==B&&(t=n.constructor,!ct(t)||t instanceof t)?(K(n,function(n,t){r=t}),r===e||ue.call(n,r)):a}function rt(n,t,e){t||(t=0),typeof e=="undefined"&&(e=n?n.length:0);var r=-1;e=e-t||0;for(var u=Dt(0>e?0:e);++r<e;)u[r]=n[t+r];return u}function ut(n){return Ee[n]}function at(n,t,r,o,i,f){var c=n;if(typeof t!="boolean"&&t!=u&&(o=r,r=t,t=a),typeof r=="function"){if(r=typeof o=="undefined"?r:W.createCallback(r,o,1),c=r(c),typeof c!="undefined")return c;
 c=n}if(o=lt(c)){var l=fe.call(c);if(!T[l])return c;var p=Ce(c)}if(!o||!t)return o?p?rt(c):U({},c):c;switch(o=je[l],l){case I:case N:return new o(+c);case $:case R:return new o(c);case F:return o(c.source,m.exec(c))}for(i||(i=[]),f||(f=[]),l=i.length;l--;)if(i[l]==n)return f[l];return c=p?o(c.length):{},p&&(ue.call(n,"index")&&(c.index=n.index),ue.call(n,"input")&&(c.input=n.input)),i.push(n),f.push(c),(p?dt:P)(n,function(n,u){c[u]=at(n,t,r,e,i,f)}),c}function ot(n){var t=[];return K(n,function(n,e){ct(n)&&t.push(e)
-}),t.sort()}function it(n){for(var t=-1,e=xe(n),r=e.length,u={};++t<r;){var a=e[t];u[n[a]]=a}return u}function ft(n,t,e,o,i,f){var c=e===l;if(typeof e=="function"&&!c){e=G.createCallback(e,o,2);var p=e(n,t);if(typeof p!="undefined")return!!p}if(n===t)return 0!==n||1/n==1/t;var s=typeof n,v=typeof t;if(n===n&&(!n||"function"!=s&&"object"!=s)&&(!t||"function"!=v&&"object"!=v))return a;if(n==u||t==u)return n===t;if(v=fe.call(n),s=fe.call(t),v==E&&(v=B),s==E&&(s=B),v!=s)return a;switch(v){case I:case N:return+n==+t;
-case $:return n!=+n?t!=+t:0==n?1/n==1/t:n==+t;case F:case R:return n==Ht(t)}if(s=v==S,!s){if(ue.call(n,"__wrapped__")||ue.call(t,"__wrapped__"))return ft(n.__wrapped__||n,t.__wrapped__||t,e,o,i,f);if(v!=B)return a;var v=n.constructor,g=t.constructor;if(v!=g&&(!ct(v)||!(v instanceof v&&ct(g)&&g instanceof g)))return a}for(i||(i=[]),f||(f=[]),v=i.length;v--;)if(i[v]==n)return f[v]==t;var y=0,p=r;if(i.push(n),f.push(t),s){if(v=n.length,y=t.length,p=y==n.length,!p&&!c)return p;for(;y--;)if(s=v,g=t[y],c)for(;s--&&!(p=ft(n[s],g,e,o,i,f)););else if(!(p=ft(n[y],g,e,o,i,f)))break;
-return p}return K(t,function(t,r,u){return ue.call(u,r)?(y++,p=ue.call(n,r)&&ft(n[r],t,e,o,i,f)):void 0}),p&&!c&&K(n,function(n,t,e){return ue.call(e,t)?p=-1<--y:void 0}),p}function ct(n){return typeof n=="function"}function lt(n){return!(!n||!q[typeof n])}function pt(n){return typeof n=="number"||fe.call(n)==$}function st(n){return typeof n=="string"||fe.call(n)==R}function vt(n,t,e){var r=arguments,u=0,a=2;if(!lt(n))return n;if(e===l)var o=r[3],i=r[4],c=r[5];else i=[],c=[],typeof e!="number"&&(a=r.length),3<a&&"function"==typeof r[a-2]?o=G.createCallback(r[--a-1],r[a--],2):2<a&&"function"==typeof r[a-1]&&(o=r[--a]);
+}),t.sort()}function it(n){for(var t=-1,e=xe(n),r=e.length,u={};++t<r;){var a=e[t];u[n[a]]=a}return u}function ft(n,t,e,o,i,f){var c=e===l;if(typeof e=="function"&&!c){e=W.createCallback(e,o,2);var p=e(n,t);if(typeof p!="undefined")return!!p}if(n===t)return 0!==n||1/n==1/t;var s=typeof n,v=typeof t;if(n===n&&(!n||"function"!=s&&"object"!=s)&&(!t||"function"!=v&&"object"!=v))return a;if(n==u||t==u)return n===t;if(v=fe.call(n),s=fe.call(t),v==E&&(v=B),s==E&&(s=B),v!=s)return a;switch(v){case I:case N:return+n==+t;
+case $:return n!=+n?t!=+t:0==n?1/n==1/t:n==+t;case F:case R:return n==Gt(t)}if(s=v==S,!s){if(ue.call(n,"__wrapped__")||ue.call(t,"__wrapped__"))return ft(n.__wrapped__||n,t.__wrapped__||t,e,o,i,f);if(v!=B)return a;var v=n.constructor,g=t.constructor;if(v!=g&&(!ct(v)||!(v instanceof v&&ct(g)&&g instanceof g)))return a}for(i||(i=[]),f||(f=[]),v=i.length;v--;)if(i[v]==n)return f[v]==t;var y=0,p=r;if(i.push(n),f.push(t),s){if(v=n.length,y=t.length,p=y==n.length,!p&&!c)return p;for(;y--;)if(s=v,g=t[y],c)for(;s--&&!(p=ft(n[s],g,e,o,i,f)););else if(!(p=ft(n[y],g,e,o,i,f)))break;
+return p}return K(t,function(t,r,u){return ue.call(u,r)?(y++,p=ue.call(n,r)&&ft(n[r],t,e,o,i,f)):void 0}),p&&!c&&K(n,function(n,t,e){return ue.call(e,t)?p=-1<--y:void 0}),p}function ct(n){return typeof n=="function"}function lt(n){return!(!n||!q[typeof n])}function pt(n){return typeof n=="number"||fe.call(n)==$}function st(n){return typeof n=="string"||fe.call(n)==R}function vt(n,t,e){var r=arguments,u=0,a=2;if(!lt(n))return n;if(e===l)var o=r[3],i=r[4],c=r[5];else i=[],c=[],typeof e!="number"&&(a=r.length),3<a&&"function"==typeof r[a-2]?o=W.createCallback(r[--a-1],r[a--],2):2<a&&"function"==typeof r[a-1]&&(o=r[--a]);
 for(;++u<a;)(Ce(r[u])?dt:P)(r[u],function(t,e){var r,u,a=t,p=n[e];if(t&&((u=Ce(t))||f(t))){for(a=i.length;a--;)if(r=i[a]==t){p=c[a];break}if(!r){var s;o&&(a=o(p,t),s=typeof a!="undefined")&&(p=a),s||(p=u?Ce(p)?p:[]:f(p)?p:{}),i.push(t),c.push(p),s||(p=vt(p,t,l,o,i,c))}}else o&&(a=o(p,t),typeof a=="undefined"&&(a=t)),typeof a!="undefined"&&(p=a);n[e]=p});return n}function gt(n){for(var t=-1,e=xe(n),r=e.length,u=Dt(r);++t<r;)u[t]=n[e[t]];return u}function yt(n,t,e){var r=-1,u=Z(),o=n?n.length:0,i=a;
-return e=(0>e?ye(0,o+e):e)||0,o&&typeof o=="number"?i=-1<(st(n)?n.indexOf(t,e):u(n,t,e)):P(n,function(n){return++r<e?void 0:!(i=n===t)}),i}function ht(n,t,e){var u=r;t=G.createCallback(t,e),e=-1;var a=n?n.length:0;if(typeof a=="number")for(;++e<a&&(u=!!t(n[e],e,n)););else P(n,function(n,e,r){return u=!!t(n,e,r)});return u}function bt(n,t,e){var r=[];t=G.createCallback(t,e),e=-1;var u=n?n.length:0;if(typeof u=="number")for(;++e<u;){var a=n[e];t(a,e,n)&&r.push(a)}else P(n,function(n,e,u){t(n,e,u)&&r.push(n)
-});return r}function mt(n,t,e){t=G.createCallback(t,e),e=-1;var r=n?n.length:0;if(typeof r!="number"){var u;return P(n,function(n,e,r){return t(n,e,r)?(u=n,a):void 0}),u}for(;++e<r;){var o=n[e];if(t(o,e,n))return o}}function dt(n,t,e){var r=-1,u=n?n.length:0;if(t=t&&typeof e=="undefined"?t:G.createCallback(t,e),typeof u=="number")for(;++r<u&&t(n[r],r,n)!==false;);else P(n,t);return n}function _t(n,t,e){var r=-1,u=n?n.length:0;if(t=G.createCallback(t,e),typeof u=="number")for(var a=Dt(u);++r<u;)a[r]=t(n[r],r,n);
-else a=[],P(n,function(n,e,u){a[++r]=t(n,e,u)});return a}function kt(n,t,e){var r=-1/0,u=r;if(!t&&Ce(n)){e=-1;for(var a=n.length;++e<a;){var o=n[e];o>u&&(u=o)}}else t=!t&&st(n)?J:G.createCallback(t,e),dt(n,function(n,e,a){e=t(n,e,a),e>r&&(r=e,u=n)});return u}function jt(n,t){var e=-1,r=n?n.length:0;if(typeof r=="number")for(var u=Dt(r);++e<r;)u[e]=n[e][t];return u||_t(n,t)}function wt(n,t,e,r){if(!n)return e;var u=3>arguments.length;t=G.createCallback(t,r,4);var o=-1,i=n.length;if(typeof i=="number")for(u&&(e=n[++o]);++o<i;)e=t(e,n[o],o,n);
-else P(n,function(n,r,o){e=u?(u=a,n):t(e,n,r,o)});return e}function Ct(n,t,e,r){var u=n?n.length:0,o=3>arguments.length;if(typeof u!="number")var i=xe(n),u=i.length;return t=G.createCallback(t,r,4),dt(n,function(r,f,c){f=i?i[--u]:--u,e=o?(o=a,n[f]):t(e,n[f],f,c)}),e}function xt(n,t,e){var r;t=G.createCallback(t,e),e=-1;var u=n?n.length:0;if(typeof u=="number")for(;++e<u&&!(r=t(n[e],e,n)););else P(n,function(n,e,u){return!(r=t(n,e,u))});return!!r}function Ot(n){for(var t=-1,e=n?n.length:0,r=ne.apply(Lt,de.call(arguments,1)),r=W(r).contains,u=[];++t<e;){var a=n[t];
-r(a)||u.push(a)}return u}function Et(n,t,e){if(n){var r=0,a=n.length;if(typeof t!="number"&&t!=u){var o=-1;for(t=G.createCallback(t,e);++o<a&&t(n[o],o,n);)r++}else if(r=t,r==u||e)return n[0];return rt(n,0,he(ye(0,r),a))}}function St(n,t,e){if(typeof e=="number"){var r=n?n.length:0;e=0>e?ye(0,r+e):e||0}else if(e)return e=Nt(n,t),n[e]===t?e:-1;return n?H(n,t,e):-1}function It(n,t,e){if(typeof t!="number"&&t!=u){var r=0,a=-1,o=n?n.length:0;for(t=G.createCallback(t,e);++a<o&&t(n[a],a,n);)r++}else r=t==u||e?1:ye(0,t);
-return rt(n,r)}function Nt(n,t,e,r){var u=0,a=n?n.length:u;for(e=e?G.createCallback(e,r,1):Rt,t=e(t);u<a;)r=u+a>>>1,e(n[r])<t?u=r+1:a=r;return u}function At(n){for(var t=-1,e=n?kt(jt(n,"length")):0,r=Dt(0>e?0:e);++t<e;)r[t]=jt(n,t);return r}function $t(n,t){for(var e=-1,r=n?n.length:0,u={};++e<r;){var a=n[e];t?u[a]=t[e]:u[a[0]]=a[1]}return u}function Bt(n,t){return we.fastBind||ce&&2<arguments.length?ce.call.apply(ce,arguments):Q(n,t,de.call(arguments,2))}function Ft(n){var t=de.call(arguments,1);
-return ie(function(){n.apply(e,t)},1)}function Rt(n){return n}function Tt(n){dt(ot(n),function(t){var e=G[t]=n[t];G.prototype[t]=function(){var n=this.__wrapped__,t=[n];return ae.apply(t,arguments),t=e.apply(G,t),n&&typeof n=="object"&&n==t?this:new nt(t)}})}function qt(){return this.__wrapped__}o=o?z.defaults(n.Object(),o,z.pick(n,O)):n;var Dt=o.Array,zt=o.Boolean,Pt=o.Date,Kt=o.Function,Mt=o.Math,Ut=o.Number,Vt=o.Object,Gt=o.RegExp,Ht=o.String,Jt=o.TypeError,Lt=Dt.prototype,Qt=Vt.prototype,Wt=o._,Xt=Gt("^"+Ht(Qt.valueOf).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/valueOf|for [^\]]+/g,".+?")+"$"),Yt=Mt.ceil,Zt=o.clearTimeout,ne=Lt.concat,te=Mt.floor,ee=Kt.prototype.toString,re=Xt.test(re=Vt.getPrototypeOf)&&re,ue=Qt.hasOwnProperty,ae=Lt.push,oe=o.setImmediate,ie=o.setTimeout,fe=Qt.toString,ce=Xt.test(ce=fe.bind)&&ce,le=Xt.test(le=Vt.create)&&le,pe=Xt.test(pe=Dt.isArray)&&pe,se=o.isFinite,ve=o.isNaN,ge=Xt.test(ge=Vt.keys)&&ge,ye=Mt.max,he=Mt.min,be=o.parseInt,me=Mt.random,de=Lt.slice,_e=Xt.test(o.attachEvent),ke=ce&&!/\n|true/.test(ce+_e),je={};
-je[S]=Dt,je[I]=zt,je[N]=Pt,je[A]=Kt,je[B]=Vt,je[$]=Ut,je[F]=Gt,je[R]=Ht;var we=G.support={};we.fastBind=ce&&!ke,G.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:d,variable:"",imports:{_:G}},nt.prototype=G.prototype;var Ce=pe,xe=ge?function(n){return lt(n)?ge(n):[]}:V,Oe={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"},Ee=it(Oe),Se=tt(function Ae(n,t,e){for(var r=-1,u=n?n.length:0,a=[];++r<u;){var o=n[r];e&&(o=e(o,r,n)),Ce(o)?ae.apply(a,t?o:Ae(o)):a.push(o)
-}return a}),Ie=tt(function(n,t,e){for(var r=-1,u=Z(),a=n?n.length:0,o=!t&&a>=s,i=[],f=o?W():e?[]:i;++r<a;){var c=n[r],l=e?e(c,r,n):c;(t?r&&f[f.length-1]===l:o?f.contains(l):0<=u(f,l))||((e||o)&&f.push(l),i.push(c))}return i});ke&&i&&typeof oe=="function"&&(Ft=Bt(oe,o));var Ne=8==be(k+"08")?be:function(n,t){return be(st(n)?n.replace(j,""):n,t||0)};return G.after=function(n,t){return 1>n?t():function(){return 1>--n?t.apply(this,arguments):void 0}},G.assign=U,G.at=function(n){for(var t=-1,e=ne.apply(Lt,de.call(arguments,1)),r=e.length,u=Dt(r);++t<r;)u[t]=n[e[t]];
-return u},G.bind=Bt,G.bindAll=function(n){for(var t=1<arguments.length?ne.apply(Lt,de.call(arguments,1)):ot(n),e=-1,r=t.length;++e<r;){var u=t[e];n[u]=Bt(n[u],n)}return n},G.bindKey=function(n,t){return Q(n,t,de.call(arguments,2),l)},G.compact=function(n){for(var t=-1,e=n?n.length:0,r=[];++t<e;){var u=n[t];u&&r.push(u)}return r},G.compose=function(){var n=arguments;return function(){for(var t=arguments,e=n.length;e--;)t=[n[e].apply(this,t)];return t[0]}},G.countBy=function(n,t,e){var r={};return t=G.createCallback(t,e),dt(n,function(n,e,u){e=Ht(t(n,e,u)),ue.call(r,e)?r[e]++:r[e]=1
-}),r},G.createCallback=function(n,t,e){if(n==u)return Rt;var r=typeof n;if("function"!=r){if("object"!=r)return function(t){return t[n]};var o=xe(n);return function(t){for(var e=o.length,r=a;e--&&(r=ft(t[o[e]],n[o[e]],l)););return r}}return typeof t=="undefined"||_&&!_.test(ee.call(n))?n:1===e?function(e){return n.call(t,e)}:2===e?function(e,r){return n.call(t,e,r)}:4===e?function(e,r,u,a){return n.call(t,e,r,u,a)}:function(e,r,u){return n.call(t,e,r,u)}},G.debounce=function(n,t,e){function o(){var t=s&&(!v||1<l);
-l=p=0,t&&(f=n.apply(c,i))}var i,f,c,l=0,p=u,s=r;if(e===r)var v=r,s=a;else lt(e)&&(v=e.leading,s="trailing"in e?e.trailing:s);return function(){return i=arguments,c=this,Zt(p),v&&2>++l&&(f=n.apply(c,i)),p=ie(o,t),f}},G.defaults=M,G.defer=Ft,G.delay=function(n,t){var r=de.call(arguments,2);return ie(function(){n.apply(e,r)},t)},G.difference=Ot,G.filter=bt,G.flatten=Se,G.forEach=dt,G.forIn=K,G.forOwn=P,G.functions=ot,G.groupBy=function(n,t,e){var r={};return t=G.createCallback(t,e),dt(n,function(n,e,u){e=Ht(t(n,e,u)),(ue.call(r,e)?r[e]:r[e]=[]).push(n)
-}),r},G.initial=function(n,t,e){if(!n)return[];var r=0,a=n.length;if(typeof t!="number"&&t!=u){var o=a;for(t=G.createCallback(t,e);o--&&t(n[o],o,n);)r++}else r=t==u||e?1:t||r;return rt(n,0,he(ye(0,a-r),a))},G.intersection=function(n){var t=arguments,e=t.length,r=W(),u={},a=-1,o=n?n.length:0,i=[];n:for(;++a<o;){var f=n[a];if(!r.contains(f)){var c=e;for(r.push(f);--c;)if(!(u[c]||(u[c]=W(t[c]).contains))(f))continue n;i.push(f)}}return i},G.invert=it,G.invoke=function(n,t){var e=de.call(arguments,2),r=-1,u=typeof t=="function",a=n?n.length:0,o=Dt(typeof a=="number"?a:0);
-return dt(n,function(n){o[++r]=(u?t:n[t]).apply(n,e)}),o},G.keys=xe,G.map=_t,G.max=kt,G.memoize=function(n,t){function e(){var r=e.cache,u=p+(t?t.apply(this,arguments):arguments[0]);return ue.call(r,u)?r[u]:r[u]=n.apply(this,arguments)}return e.cache={},e},G.merge=vt,G.min=function(n,t,e){var r=1/0,u=r;if(!t&&Ce(n)){e=-1;for(var a=n.length;++e<a;){var o=n[e];o<u&&(u=o)}}else t=!t&&st(n)?J:G.createCallback(t,e),dt(n,function(n,e,a){e=t(n,e,a),e<r&&(r=e,u=n)});return u},G.omit=function(n,t,e){var r=Z(),u=typeof t=="function",a={};
-if(u)t=G.createCallback(t,e);else var o=ne.apply(Lt,de.call(arguments,1));return K(n,function(n,e,i){(u?!t(n,e,i):0>r(o,e))&&(a[e]=n)}),a},G.once=function(n){var t,e;return function(){return t?e:(t=r,e=n.apply(this,arguments),n=u,e)}},G.pairs=function(n){for(var t=-1,e=xe(n),r=e.length,u=Dt(r);++t<r;){var a=e[t];u[t]=[a,n[a]]}return u},G.partial=function(n){return Q(n,de.call(arguments,1))},G.partialRight=function(n){return Q(n,de.call(arguments,1),u,l)},G.pick=function(n,t,e){var r={};if(typeof t!="function")for(var u=-1,a=ne.apply(Lt,de.call(arguments,1)),o=lt(n)?a.length:0;++u<o;){var i=a[u];
-i in n&&(r[i]=n[i])}else t=G.createCallback(t,e),K(n,function(n,e,u){t(n,e,u)&&(r[e]=n)});return r},G.pluck=jt,G.range=function(n,t,e){n=+n||0,e=+e||1,t==u&&(t=n,n=0);var r=-1;t=ye(0,Yt((t-n)/e));for(var a=Dt(t);++r<t;)a[r]=n,n+=e;return a},G.reject=function(n,t,e){return t=G.createCallback(t,e),bt(n,function(n,e,r){return!t(n,e,r)})},G.rest=It,G.shuffle=function(n){var t=-1,e=n?n.length:0,r=Dt(typeof e=="number"?e:0);return dt(n,function(n){var e=te(me()*(++t+1));r[t]=r[e],r[e]=n}),r},G.sortBy=function(n,t,e){var r=-1,u=n?n.length:0,a=Dt(typeof u=="number"?u:0);
-for(t=G.createCallback(t,e),dt(n,function(n,e,u){a[++r]={a:t(n,e,u),b:r,c:n}}),u=a.length,a.sort(L);u--;)a[u]=a[u].c;return a},G.tap=function(n,t){return t(n),n},G.throttle=function(n,t,e){function o(){s=u,v&&(l=new Pt,f=n.apply(c,i))}var i,f,c,l=0,p=r,s=u,v=r;return e===false?p=a:lt(e)&&(p="leading"in e?e.leading:p,v="trailing"in e?e.trailing:v),function(){var e=new Pt;!s&&!p&&(l=e);var r=t-(e-l);return i=arguments,c=this,0<r?s||(s=ie(o,r)):(Zt(s),s=u,l=e,f=n.apply(c,i)),f}},G.times=function(n,t,e){n=-1<(n=+n)?n:0;
-var r=-1,u=Dt(n);for(t=G.createCallback(t,e,1);++r<n;)u[r]=t(r);return u},G.toArray=function(n){return n&&typeof n.length=="number"?rt(n):gt(n)},G.transform=function(n,t,e,r){var a=Ce(n);return t=G.createCallback(t,r,4),e==u&&(a?e=[]:(r=n&&n.constructor,e=lt(r&&r.prototype)?le(r&&r.prototype):{})),(a?dt:P)(n,function(n,r,u){return t(e,n,r,u)}),e},G.union=function(n){return Ce(n)||(arguments[0]=n?de.call(n):Lt),Ie(ne.apply(Lt,arguments))},G.uniq=Ie,G.unzip=At,G.values=gt,G.where=bt,G.without=function(n){return Ot(n,de.call(arguments,1))
-},G.wrap=function(n,t){return function(){var e=[n];return ae.apply(e,arguments),t.apply(this,e)}},G.zip=function(n){return n?At(arguments):[]},G.zipObject=$t,G.collect=_t,G.drop=It,G.each=dt,G.extend=U,G.methods=ot,G.object=$t,G.select=bt,G.tail=It,G.unique=Ie,Tt(G),G.chain=G,G.prototype.chain=function(){return this},G.clone=at,G.cloneDeep=function(n,t,e){return at(n,r,t,e)},G.contains=yt,G.escape=function(n){return n==u?"":Ht(n).replace(C,X)},G.every=ht,G.find=mt,G.findIndex=function(n,t,e){var r=-1,u=n?n.length:0;
-for(t=G.createCallback(t,e);++r<u;)if(t(n[r],r,n))return r;return-1},G.findKey=function(n,t,e){var r;return t=G.createCallback(t,e),P(n,function(n,e,u){return t(n,e,u)?(r=e,a):void 0}),r},G.has=function(n,t){return n?ue.call(n,t):a},G.identity=Rt,G.indexOf=St,G.isArguments=function(n){return fe.call(n)==E},G.isArray=Ce,G.isBoolean=function(n){return n===r||n===false||fe.call(n)==I},G.isDate=function(n){return n?typeof n=="object"&&fe.call(n)==N:a},G.isElement=function(n){return n?1===n.nodeType:a},G.isEmpty=function(n){var t=r;
-if(!n)return t;var e=fe.call(n),u=n.length;return e==S||e==R||e==E||e==B&&typeof u=="number"&&ct(n.splice)?!u:(P(n,function(){return t=a}),t)},G.isEqual=ft,G.isFinite=function(n){return se(n)&&!ve(parseFloat(n))},G.isFunction=ct,G.isNaN=function(n){return pt(n)&&n!=+n},G.isNull=function(n){return n===u},G.isNumber=pt,G.isObject=lt,G.isPlainObject=f,G.isRegExp=function(n){return n?typeof n=="object"&&fe.call(n)==F:a},G.isString=st,G.isUndefined=function(n){return typeof n=="undefined"},G.lastIndexOf=function(n,t,e){var r=n?n.length:0;
-for(typeof e=="number"&&(r=(0>e?ye(0,r+e):he(e,r-1))+1);r--;)if(n[r]===t)return r;return-1},G.mixin=Tt,G.noConflict=function(){return o._=Wt,this},G.parseInt=Ne,G.random=function(n,t){n==u&&t==u&&(t=1),n=+n||0,t==u?(t=n,n=0):t=+t||0;var e=me();return n%1||t%1?n+he(e*(t-n+parseFloat("1e-"+((e+"").length-1))),t):n+te(e*(t-n+1))},G.reduce=wt,G.reduceRight=Ct,G.result=function(n,t){var r=n?n[t]:e;return ct(r)?n[t]():r},G.runInContext=t,G.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:xe(n).length
-},G.some=xt,G.sortedIndex=Nt,G.template=function(n,t,u){var a=G.templateSettings;n||(n=""),u=M({},u,a);var o,i=M({},u.imports,a.imports),a=xe(i),i=gt(i),f=0,c=u.interpolate||w,l="__p+='",c=Gt((u.escape||w).source+"|"+c.source+"|"+(c===d?b:w).source+"|"+(u.evaluate||w).source+"|$","g");n.replace(c,function(t,e,u,a,i,c){return u||(u=a),l+=n.slice(f,c).replace(x,Y),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=Kt(a,"return "+l).apply(e,i)}catch(s){throw s.source=l,s}return t?p(t):(p.source=l,p)},G.unescape=function(n){return n==u?"":Ht(n).replace(h,ut)},G.uniqueId=function(n){var t=++c;return Ht(n==u?"":n)+t},G.all=ht,G.any=xt,G.detect=mt,G.foldl=wt,G.foldr=Ct,G.include=yt,G.inject=wt,P(G,function(n,t){G.prototype[t]||(G.prototype[t]=function(){var t=[this.__wrapped__];return ae.apply(t,arguments),n.apply(G,t)})}),G.first=Et,G.last=function(n,t,e){if(n){var r=0,a=n.length;if(typeof t!="number"&&t!=u){var o=a;
-for(t=G.createCallback(t,e);o--&&t(n[o],o,n);)r++}else if(r=t,r==u||e)return n[a-1];return rt(n,ye(0,a-r))}},G.take=Et,G.head=Et,P(G,function(n,t){G.prototype[t]||(G.prototype[t]=function(t,e){var r=n(this.__wrapped__,t,e);return t==u||e&&typeof t!="function"?r:new nt(r)})}),G.VERSION="1.2.1",G.prototype.toString=function(){return Ht(this.__wrapped__)},G.prototype.value=qt,G.prototype.valueOf=qt,dt(["join","pop","shift"],function(n){var t=Lt[n];G.prototype[n]=function(){return t.apply(this.__wrapped__,arguments)
-}}),dt(["push","reverse","sort","unshift"],function(n){var t=Lt[n];G.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),dt(["concat","slice","splice"],function(n){var t=Lt[n];G.prototype[n]=function(){return new nt(t.apply(this.__wrapped__,arguments))}}),G}var e,r=!0,u=null,a=!1,o=typeof exports=="object"&&exports,i=typeof module=="object"&&module&&module.exports==o&&module,f=typeof global=="object"&&global;(f.global===f||f.window===f)&&(n=f);var c=0,l={},p=+new Date+"",s=75,v=/\b__p\+='';/g,g=/\b(__p\+=)''\+/g,y=/(__e\(.*?\)|\b__t\))\+'';/g,h=/&(?:amp|lt|gt|quot|#39);/g,b=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,m=/\w*$/,d=/<%=([\s\S]+?)%>/g,_=(_=/\bthis\b/)&&_.test(t)&&_,k=" \t\x0B\f\xa0\ufeff\n\r\u2028\u2029\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000",j=RegExp("^["+k+"]*0+(?=.$)"),w=/($^)/,C=/[&<>"']/g,x=/['\n\r\t\u2028\u2029\\]/g,O="Array Boolean Date Function Math Number Object RegExp String _ attachEvent clearTimeout isFinite isNaN parseInt setImmediate setTimeout".split(" "),E="[object Arguments]",S="[object Array]",I="[object Boolean]",N="[object Date]",A="[object Function]",$="[object Number]",B="[object Object]",F="[object RegExp]",R="[object String]",T={};
+return e=(0>e?ye(0,o+e):e)||0,o&&typeof o=="number"?i=-1<(st(n)?n.indexOf(t,e):u(n,t,e)):P(n,function(n){return++r<e?void 0:!(i=n===t)}),i}function ht(n,t,e){var u=r;t=W.createCallback(t,e),e=-1;var a=n?n.length:0;if(typeof a=="number")for(;++e<a&&(u=!!t(n[e],e,n)););else P(n,function(n,e,r){return u=!!t(n,e,r)});return u}function bt(n,t,e){var r=[];t=W.createCallback(t,e),e=-1;var u=n?n.length:0;if(typeof u=="number")for(;++e<u;){var a=n[e];t(a,e,n)&&r.push(a)}else P(n,function(n,e,u){t(n,e,u)&&r.push(n)
+});return r}function mt(n,t,e){t=W.createCallback(t,e),e=-1;var r=n?n.length:0;if(typeof r!="number"){var u;return P(n,function(n,e,r){return t(n,e,r)?(u=n,a):void 0}),u}for(;++e<r;){var o=n[e];if(t(o,e,n))return o}}function dt(n,t,e){var r=-1,u=n?n.length:0;if(t=t&&typeof e=="undefined"?t:W.createCallback(t,e),typeof u=="number")for(;++r<u&&t(n[r],r,n)!==false;);else P(n,t);return n}function _t(n,t,e){var r=-1,u=n?n.length:0;if(t=W.createCallback(t,e),typeof u=="number")for(var a=Dt(u);++r<u;)a[r]=t(n[r],r,n);
+else a=[],P(n,function(n,e,u){a[++r]=t(n,e,u)});return a}function kt(n,t,e){var r=-1/0,u=r;if(!t&&Ce(n)){e=-1;for(var a=n.length;++e<a;){var o=n[e];o>u&&(u=o)}}else t=!t&&st(n)?H:W.createCallback(t,e),dt(n,function(n,e,a){e=t(n,e,a),e>r&&(r=e,u=n)});return u}function jt(n,t){var e=-1,r=n?n.length:0;if(typeof r=="number")for(var u=Dt(r);++e<r;)u[e]=n[e][t];return u||_t(n,t)}function wt(n,t,e,r){if(!n)return e;var u=3>arguments.length;t=W.createCallback(t,r,4);var o=-1,i=n.length;if(typeof i=="number")for(u&&(e=n[++o]);++o<i;)e=t(e,n[o],o,n);
+else P(n,function(n,r,o){e=u?(u=a,n):t(e,n,r,o)});return e}function Ct(n,t,e,r){var u=n?n.length:0,o=3>arguments.length;if(typeof u!="number")var i=xe(n),u=i.length;return t=W.createCallback(t,r,4),dt(n,function(r,f,c){f=i?i[--u]:--u,e=o?(o=a,n[f]):t(e,n[f],f,c)}),e}function xt(n,t,e){var r;t=W.createCallback(t,e),e=-1;var u=n?n.length:0;if(typeof u=="number")for(;++e<u&&!(r=t(n[e],e,n)););else P(n,function(n,e,u){return!(r=t(n,e,u))});return!!r}function Ot(n){for(var t=-1,e=n?n.length:0,r=ne.apply(Jt,de.call(arguments,1)),r=Q(r).contains,u=[];++t<e;){var a=n[t];
+r(a)||u.push(a)}return u}function Et(n,t,e){if(n){var r=0,a=n.length;if(typeof t!="number"&&t!=u){var o=-1;for(t=W.createCallback(t,e);++o<a&&t(n[o],o,n);)r++}else if(r=t,r==u||e)return n[0];return rt(n,0,he(ye(0,r),a))}}function St(n,t,e){if(typeof e=="number"){var r=n?n.length:0;e=0>e?ye(0,r+e):e||0}else if(e)return e=Nt(n,t),n[e]===t?e:-1;return n?G(n,t,e):-1}function It(n,t,e){if(typeof t!="number"&&t!=u){var r=0,a=-1,o=n?n.length:0;for(t=W.createCallback(t,e);++a<o&&t(n[a],a,n);)r++}else r=t==u||e?1:ye(0,t);
+return rt(n,r)}function Nt(n,t,e,r){var u=0,a=n?n.length:u;for(e=e?W.createCallback(e,r,1):Rt,t=e(t);u<a;)r=u+a>>>1,e(n[r])<t?u=r+1:a=r;return u}function At(n){for(var t=-1,e=n?kt(jt(n,"length")):0,r=Dt(0>e?0:e);++t<e;)r[t]=jt(n,t);return r}function $t(n,t){for(var e=-1,r=n?n.length:0,u={};++e<r;){var a=n[e];t?u[a]=t[e]:u[a[0]]=a[1]}return u}function Bt(n,t){return we.fastBind||ce&&2<arguments.length?ce.call.apply(ce,arguments):L(n,t,de.call(arguments,2))}function Ft(n){var t=de.call(arguments,1);
+return ie(function(){n.apply(e,t)},1)}function Rt(n){return n}function Tt(n){dt(ot(n),function(t){var e=W[t]=n[t];W.prototype[t]=function(){var n=this.__wrapped__,t=[n];return ae.apply(t,arguments),t=e.apply(W,t),n&&typeof n=="object"&&n==t?this:new nt(t)}})}function qt(){return this.__wrapped__}o=o?z.defaults(n.Object(),o,z.pick(n,O)):n;var Dt=o.Array,zt=o.Boolean,Pt=o.Date,Kt=o.Function,Mt=o.Math,Ut=o.Number,Vt=o.Object,Wt=o.RegExp,Gt=o.String,Ht=o.TypeError,Jt=Dt.prototype,Lt=Vt.prototype,Qt=o._,Xt=Wt("^"+Gt(Lt.valueOf).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/valueOf|for [^\]]+/g,".+?")+"$"),Yt=Mt.ceil,Zt=o.clearTimeout,ne=Jt.concat,te=Mt.floor,ee=Kt.prototype.toString,re=Xt.test(re=Vt.getPrototypeOf)&&re,ue=Lt.hasOwnProperty,ae=Jt.push,oe=o.setImmediate,ie=o.setTimeout,fe=Lt.toString,ce=Xt.test(ce=fe.bind)&&ce,le=Xt.test(le=Vt.create)&&le,pe=Xt.test(pe=Dt.isArray)&&pe,se=o.isFinite,ve=o.isNaN,ge=Xt.test(ge=Vt.keys)&&ge,ye=Mt.max,he=Mt.min,be=o.parseInt,me=Mt.random,de=Jt.slice,_e=Xt.test(o.attachEvent),ke=ce&&!/\n|true/.test(ce+_e),je={};
+je[S]=Dt,je[I]=zt,je[N]=Pt,je[A]=Kt,je[B]=Vt,je[$]=Ut,je[F]=Wt,je[R]=Gt;var we=W.support={};we.fastBind=ce&&!ke,W.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:d,variable:"",imports:{_:W}},nt.prototype=W.prototype;var Ce=pe,xe=ge?function(n){return lt(n)?ge(n):[]}:V,Oe={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"},Ee=it(Oe),Se=tt(function Ae(n,t,e){for(var r=-1,u=n?n.length:0,a=[];++r<u;){var o=n[r];e&&(o=e(o,r,n)),Ce(o)?ae.apply(a,t?o:Ae(o)):a.push(o)
+}return a}),Ie=tt(function(n,t,e){for(var r=-1,u=Z(),a=n?n.length:0,o=!t&&a>=s,i=[],f=o?Q():e?[]:i;++r<a;){var c=n[r],l=e?e(c,r,n):c;(t?r&&f[f.length-1]===l:o?f.contains(l):0<=u(f,l))||((e||o)&&f.push(l),i.push(c))}return i});ke&&i&&typeof oe=="function"&&(Ft=Bt(oe,o));var Ne=8==be(k+"08")?be:function(n,t){return be(st(n)?n.replace(j,""):n,t||0)};return W.after=function(n,t){return 1>n?t():function(){return 1>--n?t.apply(this,arguments):void 0}},W.assign=U,W.at=function(n){for(var t=-1,e=ne.apply(Jt,de.call(arguments,1)),r=e.length,u=Dt(r);++t<r;)u[t]=n[e[t]];
+return u},W.bind=Bt,W.bindAll=function(n){for(var t=1<arguments.length?ne.apply(Jt,de.call(arguments,1)):ot(n),e=-1,r=t.length;++e<r;){var u=t[e];n[u]=Bt(n[u],n)}return n},W.bindKey=function(n,t){return L(n,t,de.call(arguments,2),l)},W.compact=function(n){for(var t=-1,e=n?n.length:0,r=[];++t<e;){var u=n[t];u&&r.push(u)}return r},W.compose=function(){var n=arguments;return function(){for(var t=arguments,e=n.length;e--;)t=[n[e].apply(this,t)];return t[0]}},W.countBy=function(n,t,e){var r={};return t=W.createCallback(t,e),dt(n,function(n,e,u){e=Gt(t(n,e,u)),ue.call(r,e)?r[e]++:r[e]=1
+}),r},W.createCallback=function(n,t,e){if(n==u)return Rt;var r=typeof n;if("function"!=r){if("object"!=r)return function(t){return t[n]};var o=xe(n);return function(t){for(var e=o.length,r=a;e--&&(r=ft(t[o[e]],n[o[e]],l)););return r}}return typeof t=="undefined"||_&&!_.test(ee.call(n))?n:1===e?function(e){return n.call(t,e)}:2===e?function(e,r){return n.call(t,e,r)}:4===e?function(e,r,u,a){return n.call(t,e,r,u,a)}:function(e,r,u){return n.call(t,e,r,u)}},W.debounce=function(n,t,e){function o(){var t=s&&(!v||1<l);
+l=p=0,t&&(f=n.apply(c,i))}var i,f,c,l=0,p=u,s=r;if(e===r)var v=r,s=a;else lt(e)&&(v=e.leading,s="trailing"in e?e.trailing:s);return function(){return i=arguments,c=this,Zt(p),v&&2>++l&&(f=n.apply(c,i)),p=ie(o,t),f}},W.defaults=M,W.defer=Ft,W.delay=function(n,t){var r=de.call(arguments,2);return ie(function(){n.apply(e,r)},t)},W.difference=Ot,W.filter=bt,W.flatten=Se,W.forEach=dt,W.forIn=K,W.forOwn=P,W.functions=ot,W.groupBy=function(n,t,e){var r={};return t=W.createCallback(t,e),dt(n,function(n,e,u){e=Gt(t(n,e,u)),(ue.call(r,e)?r[e]:r[e]=[]).push(n)
+}),r},W.initial=function(n,t,e){if(!n)return[];var r=0,a=n.length;if(typeof t!="number"&&t!=u){var o=a;for(t=W.createCallback(t,e);o--&&t(n[o],o,n);)r++}else r=t==u||e?1:t||r;return rt(n,0,he(ye(0,a-r),a))},W.intersection=function(n){var t=arguments,e=t.length,r=Q(),u={},a=-1,o=n?n.length:0,i=[];n:for(;++a<o;){var f=n[a];if(!r.contains(f)){var c=e;for(r.push(f);--c;)if(!(u[c]||(u[c]=Q(t[c]).contains))(f))continue n;i.push(f)}}return i},W.invert=it,W.invoke=function(n,t){var e=de.call(arguments,2),r=-1,u=typeof t=="function",a=n?n.length:0,o=Dt(typeof a=="number"?a:0);
+return dt(n,function(n){o[++r]=(u?t:n[t]).apply(n,e)}),o},W.keys=xe,W.map=_t,W.max=kt,W.memoize=function(n,t){function e(){var r=e.cache,u=p+(t?t.apply(this,arguments):arguments[0]);return ue.call(r,u)?r[u]:r[u]=n.apply(this,arguments)}return e.cache={},e},W.merge=vt,W.min=function(n,t,e){var r=1/0,u=r;if(!t&&Ce(n)){e=-1;for(var a=n.length;++e<a;){var o=n[e];o<u&&(u=o)}}else t=!t&&st(n)?H:W.createCallback(t,e),dt(n,function(n,e,a){e=t(n,e,a),e<r&&(r=e,u=n)});return u},W.omit=function(n,t,e){var r=Z(),u=typeof t=="function",a={};
+if(u)t=W.createCallback(t,e);else var o=ne.apply(Jt,de.call(arguments,1));return K(n,function(n,e,i){(u?!t(n,e,i):0>r(o,e))&&(a[e]=n)}),a},W.once=function(n){var t,e;return function(){return t?e:(t=r,e=n.apply(this,arguments),n=u,e)}},W.pairs=function(n){for(var t=-1,e=xe(n),r=e.length,u=Dt(r);++t<r;){var a=e[t];u[t]=[a,n[a]]}return u},W.partial=function(n){return L(n,de.call(arguments,1))},W.partialRight=function(n){return L(n,de.call(arguments,1),u,l)},W.pick=function(n,t,e){var r={};if(typeof t!="function")for(var u=-1,a=ne.apply(Jt,de.call(arguments,1)),o=lt(n)?a.length:0;++u<o;){var i=a[u];
+i in n&&(r[i]=n[i])}else t=W.createCallback(t,e),K(n,function(n,e,u){t(n,e,u)&&(r[e]=n)});return r},W.pluck=jt,W.range=function(n,t,e){n=+n||0,e=+e||1,t==u&&(t=n,n=0);var r=-1;t=ye(0,Yt((t-n)/e));for(var a=Dt(t);++r<t;)a[r]=n,n+=e;return a},W.reject=function(n,t,e){return t=W.createCallback(t,e),bt(n,function(n,e,r){return!t(n,e,r)})},W.rest=It,W.shuffle=function(n){var t=-1,e=n?n.length:0,r=Dt(typeof e=="number"?e:0);return dt(n,function(n){var e=te(me()*(++t+1));r[t]=r[e],r[e]=n}),r},W.sortBy=function(n,t,e){var r=-1,u=n?n.length:0,a=Dt(typeof u=="number"?u:0);
+for(t=W.createCallback(t,e),dt(n,function(n,e,u){a[++r]={a:t(n,e,u),b:r,c:n}}),u=a.length,a.sort(J);u--;)a[u]=a[u].c;return a},W.tap=function(n,t){return t(n),n},W.throttle=function(n,t,e){function o(){s=u,v&&(l=new Pt,f=n.apply(c,i))}var i,f,c,l=0,p=r,s=u,v=r;return e===false?p=a:lt(e)&&(p="leading"in e?e.leading:p,v="trailing"in e?e.trailing:v),function(){var e=new Pt;!s&&!p&&(l=e);var r=t-(e-l);return i=arguments,c=this,0<r?s||(s=ie(o,r)):(Zt(s),s=u,l=e,f=n.apply(c,i)),f}},W.times=function(n,t,e){n=-1<(n=+n)?n:0;
+var r=-1,u=Dt(n);for(t=W.createCallback(t,e,1);++r<n;)u[r]=t(r);return u},W.toArray=function(n){return n&&typeof n.length=="number"?rt(n):gt(n)},W.transform=function(n,t,e,r){var a=Ce(n);return t=W.createCallback(t,r,4),e==u&&(a?e=[]:(r=n&&n.constructor,e=lt(r&&r.prototype)?le(r&&r.prototype):{})),(a?dt:P)(n,function(n,r,u){return t(e,n,r,u)}),e},W.union=function(n){return Ce(n)||(arguments[0]=n?de.call(n):Jt),Ie(ne.apply(Jt,arguments))},W.uniq=Ie,W.unzip=At,W.values=gt,W.where=bt,W.without=function(n){return Ot(n,de.call(arguments,1))
+},W.wrap=function(n,t){return function(){var e=[n];return ae.apply(e,arguments),t.apply(this,e)}},W.zip=function(n){return n?At(arguments):[]},W.zipObject=$t,W.collect=_t,W.drop=It,W.each=dt,W.extend=U,W.methods=ot,W.object=$t,W.select=bt,W.tail=It,W.unique=Ie,Tt(W),W.chain=W,W.prototype.chain=function(){return this},W.clone=at,W.cloneDeep=function(n,t,e){return at(n,r,t,e)},W.contains=yt,W.escape=function(n){return n==u?"":Gt(n).replace(C,X)},W.every=ht,W.find=mt,W.findIndex=function(n,t,e){var r=-1,u=n?n.length:0;
+for(t=W.createCallback(t,e);++r<u;)if(t(n[r],r,n))return r;return-1},W.findKey=function(n,t,e){var r;return t=W.createCallback(t,e),P(n,function(n,e,u){return t(n,e,u)?(r=e,a):void 0}),r},W.has=function(n,t){return n?ue.call(n,t):a},W.identity=Rt,W.indexOf=St,W.isArguments=function(n){return fe.call(n)==E},W.isArray=Ce,W.isBoolean=function(n){return n===r||n===false||fe.call(n)==I},W.isDate=function(n){return n?typeof n=="object"&&fe.call(n)==N:a},W.isElement=function(n){return n?1===n.nodeType:a},W.isEmpty=function(n){var t=r;
+if(!n)return t;var e=fe.call(n),u=n.length;return e==S||e==R||e==E||e==B&&typeof u=="number"&&ct(n.splice)?!u:(P(n,function(){return t=a}),t)},W.isEqual=ft,W.isFinite=function(n){return se(n)&&!ve(parseFloat(n))},W.isFunction=ct,W.isNaN=function(n){return pt(n)&&n!=+n},W.isNull=function(n){return n===u},W.isNumber=pt,W.isObject=lt,W.isPlainObject=f,W.isRegExp=function(n){return n?typeof n=="object"&&fe.call(n)==F:a},W.isString=st,W.isUndefined=function(n){return typeof n=="undefined"},W.lastIndexOf=function(n,t,e){var r=n?n.length:0;
+for(typeof e=="number"&&(r=(0>e?ye(0,r+e):he(e,r-1))+1);r--;)if(n[r]===t)return r;return-1},W.mixin=Tt,W.noConflict=function(){return o._=Qt,this},W.parseInt=Ne,W.random=function(n,t){n==u&&t==u&&(t=1),n=+n||0,t==u?(t=n,n=0):t=+t||0;var e=me();return n%1||t%1?n+he(e*(t-n+parseFloat("1e-"+((e+"").length-1))),t):n+te(e*(t-n+1))},W.reduce=wt,W.reduceRight=Ct,W.result=function(n,t){var r=n?n[t]:e;return ct(r)?n[t]():r},W.runInContext=t,W.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:xe(n).length
+},W.some=xt,W.sortedIndex=Nt,W.template=function(n,t,u){var a=W.templateSettings;n||(n=""),u=M({},u,a);var o,i=M({},u.imports,a.imports),a=xe(i),i=gt(i),f=0,c=u.interpolate||w,l="__p+='",c=Wt((u.escape||w).source+"|"+c.source+"|"+(c===d?b:w).source+"|"+(u.evaluate||w).source+"|$","g");n.replace(c,function(t,e,u,a,i,c){return u||(u=a),l+=n.slice(f,c).replace(x,Y),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=Kt(a,"return "+l).apply(e,i)}catch(s){throw s.source=l,s}return t?p(t):(p.source=l,p)},W.unescape=function(n){return n==u?"":Gt(n).replace(h,ut)},W.uniqueId=function(n){var t=++c;return Gt(n==u?"":n)+t},W.all=ht,W.any=xt,W.detect=mt,W.findWhere=mt,W.foldl=wt,W.foldr=Ct,W.include=yt,W.inject=wt,P(W,function(n,t){W.prototype[t]||(W.prototype[t]=function(){var t=[this.__wrapped__];return ae.apply(t,arguments),n.apply(W,t)})}),W.first=Et,W.last=function(n,t,e){if(n){var r=0,a=n.length;if(typeof t!="number"&&t!=u){var o=a;
+for(t=W.createCallback(t,e);o--&&t(n[o],o,n);)r++}else if(r=t,r==u||e)return n[a-1];return rt(n,ye(0,a-r))}},W.take=Et,W.head=Et,P(W,function(n,t){W.prototype[t]||(W.prototype[t]=function(t,e){var r=n(this.__wrapped__,t,e);return t==u||e&&typeof t!="function"?r:new nt(r)})}),W.VERSION="1.2.1",W.prototype.toString=function(){return Gt(this.__wrapped__)},W.prototype.value=qt,W.prototype.valueOf=qt,dt(["join","pop","shift"],function(n){var t=Jt[n];W.prototype[n]=function(){return t.apply(this.__wrapped__,arguments)
+}}),dt(["push","reverse","sort","unshift"],function(n){var t=Jt[n];W.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),dt(["concat","slice","splice"],function(n){var t=Jt[n];W.prototype[n]=function(){return new nt(t.apply(this.__wrapped__,arguments))}}),W}var e,r=!0,u=null,a=!1,o=typeof exports=="object"&&exports,i=typeof module=="object"&&module&&module.exports==o&&module,f=typeof global=="object"&&global;(f.global===f||f.window===f)&&(n=f);var c=0,l={},p=+new Date+"",s=75,v=/\b__p\+='';/g,g=/\b(__p\+=)''\+/g,y=/(__e\(.*?\)|\b__t\))\+'';/g,h=/&(?:amp|lt|gt|quot|#39);/g,b=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,m=/\w*$/,d=/<%=([\s\S]+?)%>/g,_=(_=/\bthis\b/)&&_.test(t)&&_,k=" \t\x0B\f\xa0\ufeff\n\r\u2028\u2029\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u202f\u205f\u3000",j=RegExp("^["+k+"]*0+(?=.$)"),w=/($^)/,C=/[&<>"']/g,x=/['\n\r\t\u2028\u2029\\]/g,O="Array Boolean Date Function Math Number Object RegExp String _ attachEvent clearTimeout isFinite isNaN parseInt setImmediate setTimeout".split(" "),E="[object Arguments]",S="[object Array]",I="[object Boolean]",N="[object Date]",A="[object Function]",$="[object Number]",B="[object Object]",F="[object RegExp]",R="[object String]",T={};
 T[A]=a,T[E]=T[S]=T[I]=T[N]=T[$]=T[B]=T[F]=T[R]=r;var q={"boolean":a,"function":r,object:r,number:a,string:a,undefined:a},D={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},z=t();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(n._=z, define(function(){return z})):o&&!o.nodeType?i?(i.exports=z)._=z:o._=z:n._=z}(this);

dist/lodash.underscore.js

@@ -1777,7 +1777,7 @@
    *
    * @static
    * @memberOf _
-   * @alias detect
+   * @alias detect, findWhere
    * @category Collections
    * @param {Array|Object|String} collection The collection to iterate over.
    * @param {Function|Object|String} [callback=identity] The function called per
@@ -4152,8 +4152,9 @@
    * ');
    */
   function template(text, data, options) {
+    var settings = lodash.templateSettings;
     text || (text = '');
-    options = defaults({}, options, lodash.templateSettings);
+    options = defaults({}, options, settings);
 
     var index = 0,
         source = "__p += '",
@@ -4448,7 +4449,7 @@
   lodash.tail = rest;
   lodash.unique = uniq;
 
-  // add Underscore `_.chain` compat
+  // add Underscore compat
   lodash.chain = chain;
 
   /*--------------------------------------------------------------------------*/
@@ -4459,7 +4460,6 @@
   lodash.escape = escape;
   lodash.every = every;
   lodash.find = find;
-  lodash.findWhere = findWhere;
   lodash.has = has;
   lodash.identity = identity;
   lodash.indexOf = indexOf;
@@ -4497,6 +4497,7 @@
   lodash.all = every;
   lodash.any = some;
   lodash.detect = find;
+  lodash.findWhere = findWhere;
   lodash.foldl = reduce;
   lodash.foldr = reduceRight;
   lodash.include = contains;

dist/lodash.underscore.min.js

@@ -27,9 +27,9 @@ return N(n,function(n){i[++e]=(u?t:n[t]).apply(n,r)}),i},t.keys=$t,t.map=B,t.max
 return u},t.reject=function(n,t,r){return t=W(t,r),E(n,function(n,r,e){return!t(n,r,e)})},t.rest=C,t.shuffle=function(n){var t=-1,r=n?n.length:0,e=Array(typeof r=="number"?r:0);return N(n,function(n){var r=bt(qt()*(++t+1));e[t]=e[r],e[r]=n}),e},t.sortBy=function(n,t,r){var u=-1,o=n?n.length:0,i=Array(typeof o=="number"?o:0);for(t=W(t,r),N(n,function(n,r,e){i[++u]={a:t(n,r,e),b:u,c:n}}),o=i.length,i.sort(e);o--;)i[o]=i[o].c;return i},t.tap=function(n,t){return t(n),n},t.throttle=function(n,t){function r(){i=new Date,a=null,u=n.apply(o,e)
 }var e,u,o,i=0,a=null;return function(){var f=new Date,l=t-(f-i);return e=arguments,o=this,0<l?a||(a=wt(r,l)):(mt(a),a=null,i=f,u=n.apply(o,e)),u}},t.times=function(n,t,r){for(var e=-1,u=Array(-1<n?n:0);++e<n;)u[e]=t.call(r,e);return u},t.toArray=function(n){return Tt(n)?Rt.call(n):n&&typeof n.length=="number"?B(n):A(n)},t.union=function(n){return Tt(n)||(arguments[0]=n?Rt.call(n):vt),U(_t.apply(vt,arguments))},t.uniq=U,t.values=A,t.where=M,t.without=function(n){return T(n,Rt.call(arguments,1))},t.wrap=function(n,t){return function(){var r=[n];
 return jt.apply(r,arguments),t.apply(this,r)}},t.zip=function(n){for(var t=-1,r=n?F(k(arguments,"length")):0,e=Array(0>r?0:r);++t<r;)e[t]=k(arguments,t);return e},t.collect=B,t.drop=C,t.each=N,t.extend=v,t.methods=h,t.object=function(n,t){for(var r=-1,e=n?n.length:0,u={};++r<e;){var o=n[r];t?u[o]=t[r]:u[o[0]]=o[1]}return u},t.select=E,t.tail=C,t.unique=U,t.chain=function(n){return n=new l(n),n.__chain__=!0,n},t.clone=function(n){return d(n)?Tt(n)?Rt.call(n):v({},n):n},t.contains=x,t.escape=function(n){return null==n?"":(n+"").replace(tt,i)
-},t.every=O,t.find=S,t.findWhere=function(n,t){return M(n,t,!0)},t.has=function(n,t){return n?dt.call(n,t):!1},t.identity=G,t.indexOf=z,t.isArguments=s,t.isArray=Tt,t.isBoolean=function(n){return true===n||false===n||At.call(n)==ot},t.isDate=function(n){return n?typeof n=="object"&&At.call(n)==it:!1},t.isElement=function(n){return n?1===n.nodeType:!1},t.isEmpty=m,t.isEqual=_,t.isFinite=function(n){return St(n)&&!Nt(parseFloat(n))},t.isFunction=b,t.isNaN=function(n){return j(n)&&n!=+n},t.isNull=function(n){return null===n
-},t.isNumber=j,t.isObject=d,t.isRegExp=function(n){return!(!n||!pt[typeof n])&&At.call(n)==lt},t.isString=w,t.isUndefined=function(n){return typeof n=="undefined"},t.lastIndexOf=function(n,t,r){var e=n?n.length:0;for(typeof r=="number"&&(e=(0>r?Ft(0,e+r):kt(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},t.mixin=H,t.noConflict=function(){return n._=gt,this},t.random=function(n,t){null==n&&null==t&&(t=1),n=+n||0,null==t?(t=n,n=0):t=+t||0;var r=qt();return n%1||t%1?n+kt(r*(t-n+parseFloat("1e-"+((r+"").length-1))),t):n+bt(r*(t-n+1))
-},t.reduce=q,t.reduceRight=R,t.result=function(n,t){var r=n?n[t]:null;return b(r)?n[t]():r},t.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:$t(n).length},t.some=D,t.sortedIndex=P,t.template=function(n,r,e){n||(n=""),e=g({},e,t.templateSettings);var u=0,o="__p+='",i=e.variable;n.replace(RegExp((e.escape||nt).source+"|"+(e.interpolate||nt).source+"|"+(e.evaluate||nt).source+"|$","g"),function(t,r,e,i,f){return o+=n.slice(u,f).replace(rt,a),r&&(o+="'+_['escape']("+r+")+'"),i&&(o+="';"+i+";__p+='"),e&&(o+="'+((__t=("+e+"))==null?'':__t)+'"),u=f+t.length,t
-}),o+="';\n",i||(i="obj",o="with("+i+"||{}){"+o+"}"),o="function("+i+"){var __t,__p='',__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}"+o+"return __p}";try{var f=Function("_","return "+o)(t)}catch(l){throw l.source=o,l}return r?f(r):(f.source=o,f)},t.unescape=function(n){return null==n?"":(n+"").replace(Z,p)},t.uniqueId=function(n){var t=++Q+"";return n?n+t:t},t.all=O,t.any=D,t.detect=S,t.foldl=q,t.foldr=R,t.include=x,t.inject=q,t.first=$,t.last=function(n,t,r){if(n){var e=0,u=n.length;
+},t.every=O,t.find=S,t.has=function(n,t){return n?dt.call(n,t):!1},t.identity=G,t.indexOf=z,t.isArguments=s,t.isArray=Tt,t.isBoolean=function(n){return true===n||false===n||At.call(n)==ot},t.isDate=function(n){return n?typeof n=="object"&&At.call(n)==it:!1},t.isElement=function(n){return n?1===n.nodeType:!1},t.isEmpty=m,t.isEqual=_,t.isFinite=function(n){return St(n)&&!Nt(parseFloat(n))},t.isFunction=b,t.isNaN=function(n){return j(n)&&n!=+n},t.isNull=function(n){return null===n},t.isNumber=j,t.isObject=d,t.isRegExp=function(n){return!(!n||!pt[typeof n])&&At.call(n)==lt
+},t.isString=w,t.isUndefined=function(n){return typeof n=="undefined"},t.lastIndexOf=function(n,t,r){var e=n?n.length:0;for(typeof r=="number"&&(e=(0>r?Ft(0,e+r):kt(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},t.mixin=H,t.noConflict=function(){return n._=gt,this},t.random=function(n,t){null==n&&null==t&&(t=1),n=+n||0,null==t?(t=n,n=0):t=+t||0;var r=qt();return n%1||t%1?n+kt(r*(t-n+parseFloat("1e-"+((r+"").length-1))),t):n+bt(r*(t-n+1))},t.reduce=q,t.reduceRight=R,t.result=function(n,t){var r=n?n[t]:null;
+return b(r)?n[t]():r},t.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:$t(n).length},t.some=D,t.sortedIndex=P,t.template=function(n,r,e){var u=t.templateSettings;n||(n=""),e=g({},e,u);var o=0,i="__p+='",u=e.variable;n.replace(RegExp((e.escape||nt).source+"|"+(e.interpolate||nt).source+"|"+(e.evaluate||nt).source+"|$","g"),function(t,r,e,u,f){return i+=n.slice(o,f).replace(rt,a),r&&(i+="'+_['escape']("+r+")+'"),u&&(i+="';"+u+";__p+='"),e&&(i+="'+((__t=("+e+"))==null?'':__t)+'"),o=f+t.length,t
+}),i+="';\n",u||(u="obj",i="with("+u+"||{}){"+i+"}"),i="function("+u+"){var __t,__p='',__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}"+i+"return __p}";try{var f=Function("_","return "+i)(t)}catch(l){throw l.source=i,l}return r?f(r):(f.source=i,f)},t.unescape=function(n){return null==n?"":(n+"").replace(Z,p)},t.uniqueId=function(n){var t=++Q+"";return n?n+t:t},t.all=O,t.any=D,t.detect=S,t.findWhere=function(n,t){return M(n,t,!0)},t.foldl=q,t.foldr=R,t.include=x,t.inject=q,t.first=$,t.last=function(n,t,r){if(n){var e=0,u=n.length;
 if(typeof t!="number"&&null!=t){var o=u;for(t=W(t,r);o--&&t(n[o],o,n);)e++}else if(e=t,null==e||r)return n[u-1];return Rt.call(n,Ft(0,u-e))}},t.take=$,t.head=$,t.VERSION="1.2.1",H(t),t.prototype.chain=function(){return this.__chain__=!0,this},t.prototype.value=function(){return this.__wrapped__},N("pop push reverse shift sort splice unshift".split(" "),function(n){var r=vt[n];t.prototype[n]=function(){var n=this.__wrapped__;return r.apply(n,arguments),!Mt.spliceObjects&&0===n.length&&delete n[0],this
 }}),N(["concat","join","slice"],function(n){var r=vt[n];t.prototype[n]=function(){var n=r.apply(this.__wrapped__,arguments);return this.__chain__&&(n=new l(n),n.__chain__=!0),n}}),typeof define=="function"&&typeof define.amd=="object"&&define.amd?(n._=t, define(function(){return t})):J&&!J.nodeType?K?(K.exports=t)._=t:J._=t:n._=t}(this);

lodash.js

@@ -2756,7 +2756,7 @@
      *
      * @static
      * @memberOf _
-     * @alias detect
+     * @alias detect, findWhere
      * @category Collections
      * @param {Array|Object|String} collection The collection to iterate over.
      * @param {Function|Object|String} [callback=identity] The function called per
@@ -5552,7 +5552,7 @@
     // add functions to `lodash.prototype`
     mixin(lodash);
 
-    // add Underscore `_.chain` compat
+    // add Underscore compat
     lodash.chain = lodash;
     lodash.prototype.chain = function() { return this; };
 
@@ -5607,6 +5607,7 @@
     lodash.all = every;
     lodash.any = some;
     lodash.detect = find;
+    lodash.findWhere = find;
     lodash.foldl = reduce;
     lodash.foldr = reduceRight;
     lodash.include = contains;

test/test-build.js

@@ -57,6 +57,7 @@
     'drop': 'rest',
     'each': 'forEach',
     'extend': 'assign',
+    'findWhere': 'find',
     'foldl': 'reduce',
     'foldr': 'reduceRight',
     'head': 'first',
@@ -76,7 +77,7 @@
     'contains': ['include'],
     'every': ['all'],
     'filter': ['select'],
-    'find': ['detect'],
+    'find': ['detect', 'findWhere'],
     'first': ['head', 'take'],
     'forEach': ['each'],
     'functions': ['methods'],
@@ -95,7 +96,7 @@
   });
 
   /** List of all methods */
-  var allMethods = lodashMethods.concat('findWhere');
+  var allMethods = lodashMethods.slice();
 
   /** List of "Arrays" category methods */
   var arraysMethods = [
@@ -1341,37 +1342,6 @@
 
   /*--------------------------------------------------------------------------*/
 
-  QUnit.module('commands with findWhere');
-
-  (function() {
-    var commands = [
-      'underscore include=findWhere',
-      'modern include=findWhere',
-      'plus=findWhere'
-    ];
-
-    commands.forEach(function(command) {
-      asyncTest('`lodash ' + command + '`', function() {
-        var start = _.after(2, _.once(QUnit.start));
-
-        build(['-s'].concat(command.split(' ')), function(data) {
-          var basename = path.basename(data.outputPath, '.js'),
-              context = createContext();
-
-          vm.runInContext(data.source, context);
-          var lodash = context._;
-
-          var collection = [{ 'a': 1 }, { 'a': 1 }];
-          deepEqual(lodash.findWhere(collection, { 'a': 1 }), collection[0], '_.findWhere: ' + basename);
-
-          start();
-        });
-      });
-    });
-  }());
-
-  /*--------------------------------------------------------------------------*/
-
   QUnit.module('no-dep option');
 
   (function() {