Make the guard checks in _.assign and _.defaults more thorough.

This commit is contained in:
John-David Dalton
2014-01-09 08:43:52 -08:00
parent f99668f551
commit 60b7f504e6
6 changed files with 75 additions and 49 deletions

33
dist/lodash.compat.js vendored
View File

@@ -4517,6 +4517,9 @@
* binding of `thisArg` and prepends any additional `bind` arguments to those
* provided to the bound function.
*
* Note: Unlike native `Function#bind` this method does not set the `length`
* property of bound functions.
*
* @static
* @memberOf _
* @category Functions
@@ -4546,6 +4549,8 @@
* of method names. If no method names are provided all the function properties
* of `object` will be bound.
*
* Note: This method does not set the `length` property of bound functions.
*
* @static
* @memberOf _
* @category Functions
@@ -4674,6 +4679,8 @@
* remaining `func` arguments, and so on. The arity of `func` can be specified
* if `func.length` is not sufficient.
*
* Note: This method does not set the `length` property of curried functions.
*
* @static
* @memberOf _
* @category Functions
@@ -4982,6 +4989,9 @@
* `partial` arguments prepended to those provided to the new function. This
* method is similar to `_.bind` except it does **not** alter the `this` binding.
*
* Note: This method does not set the `length` property of partially applied
* functions.
*
* @static
* @memberOf _
* @category Functions
@@ -5003,6 +5013,9 @@
* This method is like `_.partial` except that `partial` arguments are
* appended to those provided to the new function.
*
* Note: This method does not set the `length` property of partially applied
* functions.
*
* @static
* @memberOf _
* @category Functions
@@ -5137,10 +5150,10 @@
* defaults(object, { 'name': 'fred', 'employer': 'slate' });
* // => { 'name': 'barney', 'employer': 'slate' }
*/
function assign(object, source, guard) {
function assign(object, source) {
var args = arguments,
argsIndex = 0,
argsLength = typeof guard == 'number' ? 2 : args.length;
argsLength = args[3] && args[3][args[2]] === source ? 2 : args.length;
if (argsLength > 3 && typeof args[argsLength - 2] == 'function') {
var callback = baseCreateCallback(args[--argsLength - 1], args[argsLength--], 2);
@@ -5306,8 +5319,6 @@
* @category Objects
* @param {Object} object The destination object.
* @param {...Object} [source] The source objects.
* @param- {Object} [guard] Allows working with `_.reduce` without using its
* `key` and `object` arguments as sources.
* @returns {Object} Returns the destination object.
* @example
*
@@ -5315,10 +5326,10 @@
* _.defaults(object, { 'name': 'fred', 'employer': 'slate' });
* // => { 'name': 'barney', 'employer': 'slate' }
*/
function defaults(object, source, guard) {
function defaults(object, source) {
var args = arguments,
argsIndex = 0,
argsLength = typeof guard == 'number' ? 2 : args.length;
argsLength = args[3] && args[3][args[2]] === source ? 2 : args.length;
while (++argsIndex < argsLength) {
source = args[argsIndex];
@@ -5854,8 +5865,8 @@
/**
* Checks if `value` is, or can be coerced to, a finite number.
*
* Note: This is not the same as native `isFinite` which will return true for
* booleans and empty strings. See the [ES5 spec](http://es5.github.io/#x15.1.2.5)
* Note: This method is not the same as native `isFinite` which will return
* `true` for booleans and empty strings. See the [ES5 spec](http://es5.github.io/#x15.1.2.5)
* for more details.
*
* @static
@@ -5938,8 +5949,8 @@
/**
* Checks if `value` is `NaN`.
*
* Note: This is not the same as native `isNaN` which will return `true` for
* `undefined` and other non-numeric values. See the [ES5 spec](http://es5.github.io/#x15.1.2.4)
* Note: This method is not the same as native `isNaN` which will return `true`
* for `undefined` and other non-numeric values. See the [ES5 spec](http://es5.github.io/#x15.1.2.4)
* for more details.
*
* @static
@@ -6379,7 +6390,7 @@
}
/**
* An alternative to `_.reduce` this method transforms `object` to a new
* An alternative to `_.reduce`; this method transforms `object` to a new
* `accumulator` object which is the result of running each of its own
* enumerable properties through a callback, with each callback execution
* potentially mutating the `accumulator` object. The callback is bound to

View File

@@ -27,8 +27,8 @@ if(t=e.createCallback(t,r,3),le(n)){r=-1;for(var o=n.length;++r<o&&(u=!!t(n[r],r
else lt(n,function(n,r,e){a[++u]=t(n,r,e)});return a}function Bt(n,t,r){var o=-1/0,a=o;if(typeof t!="function"&&r&&r[t]===n&&(t=null),null==t&&le(n)){r=-1;for(var i=n.length;++r<i;){var l=n[r];l>a&&(a=l)}}else t=null==t&&rr(n)?u:e.createCallback(t,r,3),lt(n,function(n,r,e){r=t(n,r,e),r>o&&(o=r,a=n)});return a}function Wt(n,t,r,u){var o=3>arguments.length;if(t=e.createCallback(t,u,4),le(n)){var a=-1,i=n.length;for(o&&i&&(r=n[++a]);++a<i;)r=t(r,n[a],a,n)}else lt(n,function(n,e,u){r=o?(o=false,n):t(r,n,e,u)
});return r}function zt(n,t,r,u){var o=3>arguments.length;return t=e.createCallback(t,u,4),$t(n,function(n,e,u){r=o?(o=false,n):t(r,n,e,u)}),r}function Kt(n){var t=-1,r=n?n.length:0,e=fr(typeof r=="number"?r:0);return Ft(n,function(n){var r=gt(0,++t);e[t]=e[r],e[r]=n}),e}function Mt(n,t,r){var u;if(t=e.createCallback(t,r,3),le(n)){r=-1;for(var o=n.length;++r<o&&!(u=t(n[r],r,n)););}else lt(n,function(n,r,e){return!(u=t(n,r,e))});return!!u}function Ut(n,t){return 2<arguments.length?dt(n,17,Et(arguments,2),null,t):dt(n,1,null,null,t)
}function Vt(n,t,r){var e,u,o,a,i,l,f,c=0,p=false,s=true;if(!Zt(n))throw new dr;if(t=Ur(0,t)||0,true===r)var h=true,s=false;else nr(r)&&(h=r.leading,p="maxWait"in r&&(Ur(t,r.maxWait)||0),s="trailing"in r?r.trailing:s);var g=function(){var r=t-(ge()-a);0<r?l=Dr(g,r):(u&&Sr(u),r=f,u=l=f=C,r&&(c=ge(),o=n.apply(i,e),l||u||(e=i=null)))},v=function(){l&&Sr(l),u=l=f=C,(s||p!==t)&&(c=ge(),o=n.apply(i,e),l||u||(e=i=null))};return function(){if(e=arguments,a=ge(),i=this,f=s&&(l||!h),false===p)var r=h&&!l;else{u||h||(c=a);
var y=p-(a-c),m=0>=y;m?(u&&(u=Sr(u)),c=a,o=n.apply(i,e)):u||(u=Dr(v,y))}return m&&l?l=Sr(l):l||t===p||(l=Dr(g,t)),r&&(m=true,o=n.apply(i,e)),!m||l||u||(e=i=null),o}}function Xt(n,t,r){var e=arguments,u=0,o=typeof r=="number"?2:e.length;if(3<o&&"function"==typeof e[o-2])var a=k(e[--o-1],e[o--],2);else 2<o&&"function"==typeof e[o-1]&&(a=e[--o]);for(;++u<o;)if(t=e[u],nr(t))for(var i=-1,l=ce(t),f=l.length;++i<f;){var c=l[i];n[c]=a?a(n[c],t[c]):t[c]}return n}function Gt(n,t,r){for(var e=arguments,u=0,o=typeof r=="number"?2:e.length;++u<o;)if(t=e[u],nr(t))for(var a=-1,i=ce(t),l=i.length;++a<l;){var f=i[a];
"undefined"==typeof n[f]&&(n[f]=t[f])}return n}function Ht(n,t,r){var e=-1,u=ce(n),o=u.length;for(t=t&&typeof r=="undefined"?t:k(t,r,3);++e<o&&(r=u[e],false!==t(n[r],r,n)););return n}function Jt(n,t,r){var e=ce(n),u=e.length;for(t=k(t,r,3);u--&&(r=e[u],false!==t(n[r],r,n)););return n}function Qt(n){var t=[];return ie(n,function(n,r){Zt(n)&&t.push(r)}),t.sort()}function Yt(n){return n&&typeof n=="object"&&1===n.nodeType&&(ne.nodeClass?-1<kr.call(n).indexOf("Element"):g(n))||false}function Zt(n){return typeof n=="function"
var y=p-(a-c),m=0>=y;m?(u&&(u=Sr(u)),c=a,o=n.apply(i,e)):u||(u=Dr(v,y))}return m&&l?l=Sr(l):l||t===p||(l=Dr(g,t)),r&&(m=true,o=n.apply(i,e)),!m||l||u||(e=i=null),o}}function Xt(n,t){var r=arguments,e=0,u=r[3]&&r[3][r[2]]===t?2:r.length;if(3<u&&"function"==typeof r[u-2])var o=k(r[--u-1],r[u--],2);else 2<u&&"function"==typeof r[u-1]&&(o=r[--u]);for(;++e<u;)if(t=r[e],nr(t))for(var a=-1,i=ce(t),l=i.length;++a<l;){var f=i[a];n[f]=o?o(n[f],t[f]):t[f]}return n}function Gt(n,t){for(var r=arguments,e=0,u=r[3]&&r[3][r[2]]===t?2:r.length;++e<u;)if(t=r[e],nr(t))for(var o=-1,a=ce(t),i=a.length;++o<i;){var l=a[o];
"undefined"==typeof n[l]&&(n[l]=t[l])}return n}function Ht(n,t,r){var e=-1,u=ce(n),o=u.length;for(t=t&&typeof r=="undefined"?t:k(t,r,3);++e<o&&(r=u[e],false!==t(n[r],r,n)););return n}function Jt(n,t,r){var e=ce(n),u=e.length;for(t=k(t,r,3);u--&&(r=e[u],false!==t(n[r],r,n)););return n}function Qt(n){var t=[];return ie(n,function(n,r){Zt(n)&&t.push(r)}),t.sort()}function Yt(n){return n&&typeof n=="object"&&1===n.nodeType&&(ne.nodeClass?-1<kr.call(n).indexOf("Element"):g(n))||false}function Zt(n){return typeof n=="function"
}function nr(n){return!(!n||!ct[typeof n])}function tr(n){return typeof n=="number"||n&&typeof n=="object"&&kr.call(n)==tt||false}function rr(n){return typeof n=="string"||n&&typeof n=="object"&&kr.call(n)==ut||false}function er(n){for(var t=-1,r=ce(n),e=r.length,u=fr(e);++t<e;)u[t]=n[r[t]];return u}function ur(n){return n}function or(n){n||(n={});var t=ce(n),r=t[0],e=n[r];return 1!=t.length||e!==e||nr(e)?function(r){for(var e=t.length,u=false;e--&&(u=pt(r[t[e]],n[t[e]],null,true)););return u}:function(n){return n=n[r],e===n&&(0!==e||1/e==1/n)
}}function ar(n,t,r){var u=true,o=t&&Qt(t);t&&(r||o.length)||(null==r&&(r=t),t=n,n=e,o=Qt(t)),false===r?u=false:nr(r)&&"chain"in r&&(u=r.chain),r=-1;for(var a=Zt(n),i=o?o.length:0;++r<i;){var l=o[r],f=n[l]=t[l];a&&(n.prototype[l]=function(t){return function(){var r=this.__chain__,e=this.__wrapped__,o=[e];if(Tr.apply(o,arguments),o=t.apply(n,o),u||r){if(e===o&&nr(o))return this;o=new n(o),o.__chain__=r}return o}}(f))}}function ir(){}function lr(n){return function(t){return t[n]}}n=n?yt.defaults(st.Object(),n,yt.pick(st,X)):st;
var fr=n.Array,cr=n.Boolean,pr=n.Date,sr=n.Function,hr=n.Math,gr=n.Number,vr=n.Object,yr=n.RegExp,mr=n.String,dr=n.TypeError,br=fr.prototype,_r=n.Error.prototype,wr=vr.prototype,jr=mr.prototype,xr=(xr=n.window)&&xr.document,Cr=n._,kr=wr.toString,Or=yr("^"+mr(kr).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),Er=hr.ceil,Sr=n.clearTimeout,Ar=hr.floor,Ir=sr.prototype.toString,Nr=wt(Nr=vr.getPrototypeOf)&&Nr,Rr=wr.hasOwnProperty,Tr=br.push,Pr=wr.propertyIsEnumerable,Dr=n.setTimeout,qr=br.splice,Fr=br.unshift,$r=function(){try{var n={},t=wt(t=vr.defineProperty)&&t,r=t(n,n,n)&&t

33
dist/lodash.js vendored
View File

@@ -4202,6 +4202,9 @@
* binding of `thisArg` and prepends any additional `bind` arguments to those
* provided to the bound function.
*
* Note: Unlike native `Function#bind` this method does not set the `length`
* property of bound functions.
*
* @static
* @memberOf _
* @category Functions
@@ -4231,6 +4234,8 @@
* of method names. If no method names are provided all the function properties
* of `object` will be bound.
*
* Note: This method does not set the `length` property of bound functions.
*
* @static
* @memberOf _
* @category Functions
@@ -4359,6 +4364,8 @@
* remaining `func` arguments, and so on. The arity of `func` can be specified
* if `func.length` is not sufficient.
*
* Note: This method does not set the `length` property of curried functions.
*
* @static
* @memberOf _
* @category Functions
@@ -4667,6 +4674,9 @@
* `partial` arguments prepended to those provided to the new function. This
* method is similar to `_.bind` except it does **not** alter the `this` binding.
*
* Note: This method does not set the `length` property of partially applied
* functions.
*
* @static
* @memberOf _
* @category Functions
@@ -4688,6 +4698,9 @@
* This method is like `_.partial` except that `partial` arguments are
* appended to those provided to the new function.
*
* Note: This method does not set the `length` property of partially applied
* functions.
*
* @static
* @memberOf _
* @category Functions
@@ -4822,10 +4835,10 @@
* defaults(object, { 'name': 'fred', 'employer': 'slate' });
* // => { 'name': 'barney', 'employer': 'slate' }
*/
function assign(object, source, guard) {
function assign(object, source) {
var args = arguments,
argsIndex = 0,
argsLength = typeof guard == 'number' ? 2 : args.length;
argsLength = args[3] && args[3][args[2]] === source ? 2 : args.length;
if (argsLength > 3 && typeof args[argsLength - 2] == 'function') {
var callback = baseCreateCallback(args[--argsLength - 1], args[argsLength--], 2);
@@ -4991,8 +5004,6 @@
* @category Objects
* @param {Object} object The destination object.
* @param {...Object} [source] The source objects.
* @param- {Object} [guard] Allows working with `_.reduce` without using its
* `key` and `object` arguments as sources.
* @returns {Object} Returns the destination object.
* @example
*
@@ -5000,10 +5011,10 @@
* _.defaults(object, { 'name': 'fred', 'employer': 'slate' });
* // => { 'name': 'barney', 'employer': 'slate' }
*/
function defaults(object, source, guard) {
function defaults(object, source) {
var args = arguments,
argsIndex = 0,
argsLength = typeof guard == 'number' ? 2 : args.length;
argsLength = args[3] && args[3][args[2]] === source ? 2 : args.length;
while (++argsIndex < argsLength) {
source = args[argsIndex];
@@ -5544,8 +5555,8 @@
/**
* Checks if `value` is, or can be coerced to, a finite number.
*
* Note: This is not the same as native `isFinite` which will return true for
* booleans and empty strings. See the [ES5 spec](http://es5.github.io/#x15.1.2.5)
* Note: This method is not the same as native `isFinite` which will return
* `true` for booleans and empty strings. See the [ES5 spec](http://es5.github.io/#x15.1.2.5)
* for more details.
*
* @static
@@ -5622,8 +5633,8 @@
/**
* Checks if `value` is `NaN`.
*
* Note: This is not the same as native `isNaN` which will return `true` for
* `undefined` and other non-numeric values. See the [ES5 spec](http://es5.github.io/#x15.1.2.4)
* Note: This method is not the same as native `isNaN` which will return `true`
* for `undefined` and other non-numeric values. See the [ES5 spec](http://es5.github.io/#x15.1.2.4)
* for more details.
*
* @static
@@ -6059,7 +6070,7 @@
}
/**
* An alternative to `_.reduce` this method transforms `object` to a new
* An alternative to `_.reduce`; this method transforms `object` to a new
* `accumulator` object which is the result of running each of its own
* enumerable properties through a callback, with each callback execution
* potentially mutating the `accumulator` object. The callback is bound to

26
dist/lodash.min.js vendored
View File

@@ -6,9 +6,9 @@
;(function(){function n(n,t){if(n!==t){if(n>t||typeof n=="undefined")return 1;if(n<t||typeof t=="undefined")return-1}return 0}function t(n,t,r){r=(r||0)-1;for(var e=n?n.length:0;++r<e;)if(n[r]===t)return r;return-1}function r(n,r){var e=typeof r;if(n=n.h,"boolean"==e||null==r)return n[r]?0:-1;"number"!=e&&"string"!=e&&(e="object");var u="number"==e?r:A+r;return n=(n=n[e])&&n[u],"object"==e?n&&-1<t(n,r)?0:-1:n?0:-1}function e(n){var t=this.h,r=typeof n;if("boolean"==r||null==n)t[n]=true;else{"number"!=r&&"string"!=r&&(r="object");
var e="number"==r?n:A+n,t=t[r]||(t[r]={});"object"==r?(r=t[e])?r.push(n):t[e]=[n]:t[e]=true}}function u(n){return n.charCodeAt(0)}function o(n,t){for(var r=-1,e=n.length;++r<e&&0<=t.indexOf(n.charAt(r)););return r}function i(n,t){for(var r=n.length;r--&&0<=t.indexOf(n.charAt(r)););return r}function a(t,r){return n(t.i,r.i)||t.j-r.j}function f(t,r){for(var e=t.i,u=r.i,o=-1,i=e.length;++o<i;){var a=n(e[o],u[o]);if(a)return a}return t.j-r.j}function l(n){var t=-1,r=n.length,u=n[0],o=n[r/2|0],i=n[r-1];
if(u&&typeof u=="object"&&o&&typeof o=="object"&&i&&typeof i=="object")return false;for(u=h(),u["false"]=u["null"]=u["true"]=u.undefined=false,o=h(),o.g=n,o.h=u,o.push=e;++t<r;)o.push(n[t]);return o}function c(n){return ot[n]}function p(n){return"\\"+ft[n]}function s(){return x.pop()||[]}function h(){return C.pop()||{g:null,h:null,i:null,"false":false,j:0,"null":false,number:null,object:null,push:null,string:null,"true":false,undefined:false,k:null}}function v(n){n.length=0,x.length<N&&x.push(n)}function g(n){var t=n.h;
t&&g(t),n.g=n.h=n.i=n.object=n.number=n.string=n.k=null,C.length<N&&C.push(n)}function y(n,t){return(n=null==n?"":n+"")?null==t?n.slice(d(n),_(n)+1):(t+="",n.slice(o(n,t),i(n,t)+1)):n}function m(n,t){return(n=null==n?"":n+"")?null==t?n.slice(d(n)):(t+="",n.slice(o(n,t))):n}function b(n,t){return(n=null==n?"":n+"")?null==t?n.slice(0,_(n)+1):(t+="",n.slice(0,i(n,t)+1)):n}function d(n){for(var t=-1,r=n.length;++t<r;){var e=n.charCodeAt(t);if((160<e||9>e||13<e)&&32!=e&&160!=e&&5760!=e&&6158!=e&&(8192>e||8202<e&&8232!=e&&8233!=e&&8239!=e&&8287!=e&&12288!=e&&65279!=e))break
}return t}function _(n){for(var t=n.length;t--;){var r=n.charCodeAt(t);if((160<r||9>r||13<r)&&32!=r&&160!=r&&5760!=r&&6158!=r&&(8192>r||8202<r&&8232!=r&&8233!=r&&8239!=r&&8287!=r&&12288!=r&&65279!=r))break}return t}function w(n){return it[n]}function j(n){function e(n,t,r){if(!n||!at[typeof n])return n;t=t&&typeof r=="undefined"?t:N(t,r,3);for(var e in n)if(false===t(n[e],e,n))break;return n}function o(n){var t=[];if(!n||!at[typeof n])return t;for(var r in n)Er.call(n,r)&&t.push(r);return t}function i(n){return n&&typeof n=="object"&&!te(n)&&Er.call(n,"__wrapped__")?n:new d(n)
}function d(n,t){this.__chain__=!!t,this.__wrapped__=n}function _(n){function t(){if(e){var n=xt(e);Nr.apply(n,arguments)}if(this instanceof t){var o=C(r.prototype),n=r.apply(o,n||arguments);return Qt(n)?n:o}return r.apply(u,n||arguments)}var r=n[0],e=n[2],u=n[4];return Jr(t,n),t}function x(n,t,r,e,u){if(r){var o=r(n);if(typeof o!="undefined")return o}if(!Qt(n))return n;var i=wr.call(n);if(!rt[i])return n;var a=Xr[i];switch(i){case H:case J:return new a(+n);case Y:case tt:return new a(n);case nt:return o=a(n.source,z.exec(n)),o.lastIndex=n.lastIndex,o
t&&g(t),n.g=n.h=n.i=n.object=n.number=n.string=n.k=null,C.length<N&&C.push(n)}function y(n,t){return(n=null==n?"":n+"")?null==t?n.slice(b(n),_(n)+1):(t+="",n.slice(o(n,t),i(n,t)+1)):n}function m(n,t){return(n=null==n?"":n+"")?null==t?n.slice(b(n)):(t+="",n.slice(o(n,t))):n}function d(n,t){return(n=null==n?"":n+"")?null==t?n.slice(0,_(n)+1):(t+="",n.slice(0,i(n,t)+1)):n}function b(n){for(var t=-1,r=n.length;++t<r;){var e=n.charCodeAt(t);if((160<e||9>e||13<e)&&32!=e&&160!=e&&5760!=e&&6158!=e&&(8192>e||8202<e&&8232!=e&&8233!=e&&8239!=e&&8287!=e&&12288!=e&&65279!=e))break
}return t}function _(n){for(var t=n.length;t--;){var r=n.charCodeAt(t);if((160<r||9>r||13<r)&&32!=r&&160!=r&&5760!=r&&6158!=r&&(8192>r||8202<r&&8232!=r&&8233!=r&&8239!=r&&8287!=r&&12288!=r&&65279!=r))break}return t}function w(n){return it[n]}function j(n){function e(n,t,r){if(!n||!at[typeof n])return n;t=t&&typeof r=="undefined"?t:N(t,r,3);for(var e in n)if(false===t(n[e],e,n))break;return n}function o(n){var t=[];if(!n||!at[typeof n])return t;for(var r in n)Er.call(n,r)&&t.push(r);return t}function i(n){return n&&typeof n=="object"&&!te(n)&&Er.call(n,"__wrapped__")?n:new b(n)
}function b(n,t){this.__chain__=!!t,this.__wrapped__=n}function _(n){function t(){if(e){var n=xt(e);Nr.apply(n,arguments)}if(this instanceof t){var o=C(r.prototype),n=r.apply(o,n||arguments);return Qt(n)?n:o}return r.apply(u,n||arguments)}var r=n[0],e=n[2],u=n[4];return Jr(t,n),t}function x(n,t,r,e,u){if(r){var o=r(n);if(typeof o!="undefined")return o}if(!Qt(n))return n;var i=wr.call(n);if(!rt[i])return n;var a=Xr[i];switch(i){case H:case J:return new a(+n);case Y:case tt:return new a(n);case nt:return o=a(n.source,z.exec(n)),o.lastIndex=n.lastIndex,o
}if(i=te(n),t){var f=!e;e||(e=s()),u||(u=s());for(var l=e.length;l--;)if(e[l]==n)return u[l];o=i?a(n.length):{}}else o=i?xt(n):Mt({},n);return i&&(Er.call(n,"index")&&(o.index=n.index),Er.call(n,"input")&&(o.input=n.input)),t?(e.push(n),u.push(o),(i?Dt:Vt)(n,function(n,i){o[i]=x(n,t,r,e,u)}),f&&(v(e),v(u)),o):o}function C(n){return Qt(n)?Fr(n):{}}function N(n,t,r){if(typeof n!="function")return tr;if(typeof t=="undefined"||!("prototype"in n))return n;var e=n.__bindData__;if(typeof e=="undefined"&&(Gr.funcNames&&(e=!n.name),e=e||!Gr.funcDecomp,!e)){var u=Or.call(n);
Gr.funcNames||(e=!L.test(u)),e||(e=M.test(u),Jr(n,e))}if(false===e||true!==e&&1&e[1])return n;switch(r){case 1:return function(r){return n.call(t,r)};case 2:return function(r,e){return n.call(t,r,e)};case 3:return function(r,e,u){return n.call(t,r,e,u)};case 4:return function(r,e,u,o){return n.call(t,r,e,u,o)}}return Pt(n,t)}function ot(n){function t(){var n=f?i:this;if(u){var h=xt(u);Nr.apply(h,arguments)}return(o||c)&&(h||(h=xt(arguments)),o&&Nr.apply(h,o),c&&h.length<a)?(e|=16,ot([r,p?e:-4&e,h,null,i,a])):(h||(h=arguments),l&&(r=n[s]),this instanceof t?(n=C(r.prototype),h=r.apply(n,h),Qt(h)?h:n):r.apply(n,h))
}var r=n[0],e=n[1],u=n[2],o=n[3],i=n[4],a=n[5],f=1&e,l=2&e,c=4&e,p=8&e,s=r;return Jr(t,n),t}function it(n,e){var u=-1,o=mt(),i=n?n.length:0,a=i>=E&&o===t,f=[];if(a){var c=l(e);c?(o=r,e=c):a=false}for(;++u<i;)c=n[u],0>o(e,c)&&f.push(c);return a&&g(e),f}function ft(n,t,r,e){e=(e||0)-1;for(var u=n?n.length:0,o=[];++e<u;){var i=n[e];if(i&&typeof i=="object"&&typeof i.length=="number"&&(te(i)||_t(i))){t||(i=ft(i,t,r));var a=-1,f=i.length,l=o.length;for(o.length+=f;++a<f;)o[l++]=i[a]}else r||o.push(i)}return o
@@ -16,7 +16,7 @@ Gr.funcNames||(e=!L.test(u)),e||(e=M.test(u),Jr(n,e))}if(false===e||true!==e&&1&
if(f!=Z)return false;if(f=n.constructor,c=t.constructor,f!=c&&!(Jt(f)&&f instanceof f&&Jt(c)&&c instanceof c)&&"constructor"in n&&"constructor"in t)return false}for(f=!o,o||(o=s()),i||(i=s()),c=o.length;c--;)if(o[c]==n)return i[c]==t;var h=0,a=true;if(o.push(n),i.push(t),l){if(c=n.length,h=t.length,(a=h==c)||u)for(;h--;)if(l=c,p=t[h],u)for(;l--&&!(a=ct(n[l],p,r,u,o,i)););else if(!(a=ct(n[h],p,r,u,o,i)))break}else e(t,function(t,e,f){return Er.call(f,e)?(h++,a=Er.call(n,e)&&ct(n[e],t,r,u,o,i)):void 0}),a&&!u&&e(n,function(n,t,r){return Er.call(r,t)?a=-1<--h:void 0
});return o.pop(),i.pop(),f&&(v(o),v(i)),a}function pt(n,t,r,e,u){(te(t)?Dt:Vt)(t,function(t,o){var i,a,f=t,l=n[o];if(t&&((a=te(t))||re(t))){for(f=e.length;f--;)if(i=e[f]==t){l=u[f];break}if(!i){var c;r&&(f=r(l,t),c=typeof f!="undefined")&&(l=f),c||(l=a?te(l)?l:[]:re(l)?l:{}),e.push(t),u.push(l),c||pt(l,t,r,e,u)}}else r&&(f=r(l,t),typeof f=="undefined"&&(f=t)),typeof f!="undefined"&&(l=f);n[o]=l})}function st(n,t){return n+Cr(Kr()*(t-n+1))}function vt(n,e,u){var o=-1,i=mt(),a=n?n.length:0,f=[],c=!e&&a>=E&&i===t,p=u||c?s():f;
for(c&&(p=l(p),i=r);++o<a;){var h=n[o],y=u?u(h,o,n):h;(e?!o||p[p.length-1]!==y:0>i(p,y))&&((u||c)&&p.push(y),f.push(h))}return c?(v(p.g),g(p)):u&&v(p),f}function gt(n){return function(t,r,e){var u={};r=i.createCallback(r,e,3),e=-1;var o=t?t.length:0;if(typeof o=="number")for(;++e<o;){var a=t[e];n(u,a,r(a,e,t),t)}else Vt(t,function(t,e,o){n(u,t,r(t,e,o),o)});return u}}function yt(n,t,r,e,u,o){var i=1&t,a=4&t,f=16&t,l=32&t;if(!(2&t||Jt(n)))throw new gr;f&&!r.length&&(t&=-17,f=r=false),l&&!e.length&&(t&=-33,l=e=false);
var c=n&&n.__bindData__;return c&&true!==c?(c=xt(c),c[2]&&(c[2]=xt(c[2])),c[3]&&(c[3]=xt(c[3])),!i||1&c[1]||(c[4]=u),!i&&1&c[1]&&(t|=8),!a||4&c[1]||(c[5]=o),f&&Nr.apply(c[2]||(c[2]=[]),r),l&&Sr.apply(c[3]||(c[3]=[]),e),c[1]|=t,yt.apply(null,c)):(1==t||17===t?_:ot)([n,t,r,e,u,o])}function mt(){var n=(n=i.indexOf)===jt?t:n;return n}function bt(n){return typeof n=="function"&&jr.test(Or.call(n))}function dt(n){var t,r;return n&&wr.call(n)==Z&&(Er.call(n,"constructor")||(t=n.constructor,!Jt(t)||t instanceof t))?(e(n,function(n,t){r=t
var c=n&&n.__bindData__;return c&&true!==c?(c=xt(c),c[2]&&(c[2]=xt(c[2])),c[3]&&(c[3]=xt(c[3])),!i||1&c[1]||(c[4]=u),!i&&1&c[1]&&(t|=8),!a||4&c[1]||(c[5]=o),f&&Nr.apply(c[2]||(c[2]=[]),r),l&&Sr.apply(c[3]||(c[3]=[]),e),c[1]|=t,yt.apply(null,c)):(1==t||17===t?_:ot)([n,t,r,e,u,o])}function mt(){var n=(n=i.indexOf)===jt?t:n;return n}function dt(n){return typeof n=="function"&&jr.test(Or.call(n))}function bt(n){var t,r;return n&&wr.call(n)==Z&&(Er.call(n,"constructor")||(t=n.constructor,!Jt(t)||t instanceof t))?(e(n,function(n,t){r=t
}),typeof r=="undefined"||Er.call(n,r)):false}function _t(n){return n&&typeof n=="object"&&typeof n.length=="number"&&wr.call(n)==X||false}function wt(n,t,r){var e=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=-1;for(t=i.createCallback(t,r,3);++o<u&&t(n[o],o,n);)e++}else if(e=t,null==e||r)return n?n[0]:k;return xt(n,0,0<e?e:0)}function jt(n,r,e){if(typeof e=="number"){var u=n?n.length:0;e=0>e?zr(0,u+e):e||0}else if(e)return e=Ct(n,r),n[e]===r?e:-1;return t(n,r,e)}function kt(n,t,r){if(typeof t!="number"&&null!=t){var e=0,u=-1,o=n?n.length:0;
for(t=i.createCallback(t,r,3);++u<o&&t(n[u],u,n);)e++}else e=null==t||r?1:0<t?t:0;return xt(n,e)}function xt(n,t,r){var e=-1,u=n?n.length:0;for(typeof t=="undefined"?t=0:0>t?t=zr(u+t,0):t>u&&(t=u),typeof r=="undefined"?r=u:0>r?r=zr(u+r,0):r>u&&(r=u),u=r-t||0,r=ir(u);++e<u;)r[e]=n[t+e];return r}function Ct(n,t,r,e){var u=0,o=n?n.length:u;for(r=r?i.createCallback(r,e,1):tr,t=r(t);u<o;)e=u+o>>>1,r(n[e])<t?u=e+1:o=e;return u}function Ot(n,t,r,e){return typeof t!="boolean"&&null!=t&&(e=r,r=typeof t!="function"&&e&&e[t]===n?null:t,t=false),null!=r&&(r=i.createCallback(r,e,3)),vt(n,t,r)
}function At(){for(var n=1<arguments.length?arguments:arguments[0],t=-1,r=n?Bt(ne(n,"length")):0,e=ir(0>r?0:r);++t<r;)e[t]=ne(n,t);return e}function Et(n,t){var r=-1,e=n?n.length:0,u={};for(t||!e||te(n[0])||(t=[]);++r<e;){var o=n[r];t?u[o]=t[r]:o&&(u[o[0]]=o[1])}return u}function Nt(){return this.__wrapped__}function Rt(n,t,r){var e=n?n.length:0;if(r=typeof r=="number"?r:0,typeof e=="number"){if(r>=e)return false;if(typeof n=="string"||!te(n)&&Zt(n))return Dr?Dr.call(n,t,r):-1<n.indexOf(t,r);var u=mt();
@@ -25,16 +25,16 @@ return r=(0>r?zr(0,e+r):r)||0,-1<u(n,t,r)}var o=-1,i=false;return Vt(n,function(
Vt(n,function(n,r,o){return r=u?u[--e]:--e,t(o[r],r,o)})}return n}function $t(n,t,r){var e=-1,u=n?n.length:0;if(t=i.createCallback(t,r,3),typeof u=="number")for(var o=ir(u);++e<u;)o[e]=t(n[e],e,n);else o=[],Vt(n,function(n,r,u){o[++e]=t(n,r,u)});return o}function Bt(n,t,r){var e=-1/0,o=e;if(typeof t!="function"&&r&&r[t]===n&&(t=null),null==t&&te(n)){r=-1;for(var a=n.length;++r<a;){var f=n[r];f>o&&(o=f)}}else t=null==t&&Zt(n)?u:i.createCallback(t,r,3),Dt(n,function(n,r,u){r=t(n,r,u),r>e&&(e=r,o=n)
});return o}function qt(n,t,r,e){var u=3>arguments.length;t=i.createCallback(t,e,4);var o=-1,a=n?n.length:0;if(typeof a=="number")for(u&&a&&(r=n[++o]);++o<a;)r=t(r,n[o],o,n);else Vt(n,function(n,e,o){r=u?(u=false,n):t(r,n,e,o)});return r}function Wt(n,t,r,e){var u=3>arguments.length;return t=i.createCallback(t,e,4),Ft(n,function(n,e,o){r=u?(u=false,n):t(r,n,e,o)}),r}function zt(n){var t=-1,r=n?n.length:0,e=ir(typeof r=="number"?r:0);return Dt(n,function(n){var r=st(0,++t);e[t]=e[r],e[r]=n}),e}function Lt(n,t,r){var e;
t=i.createCallback(t,r,3),r=-1;var u=n?n.length:0;if(typeof u=="number")for(;++r<u&&!(e=t(n[r],r,n)););else Vt(n,function(n,r,u){return!(e=t(n,r,u))});return!!e}function Pt(n,t){return 2<arguments.length?yt(n,17,xt(arguments,2),null,t):yt(n,1,null,null,t)}function Kt(n,t,r){function e(){c&&xr(c),i=c=p=k,(v||h!==t)&&(s=ae(),a=n.apply(l,o),c||i||(o=l=null))}function u(){var r=t-(ae()-f);0<r?c=Rr(u,r):(i&&xr(i),r=p,i=c=p=k,r&&(s=ae(),a=n.apply(l,o),c||i||(o=l=null)))}var o,i,a,f,l,c,p,s=0,h=false,v=true;
if(!Jt(n))throw new gr;if(t=zr(0,t)||0,true===r)var g=true,v=false;else Qt(r)&&(g=r.leading,h="maxWait"in r&&(zr(t,r.maxWait)||0),v="trailing"in r?r.trailing:v);return function(){if(o=arguments,f=ae(),l=this,p=v&&(c||!g),false===h)var r=g&&!c;else{i||g||(s=f);var y=h-(f-s),m=0>=y;m?(i&&(i=xr(i)),s=f,a=n.apply(l,o)):i||(i=Rr(e,y))}return m&&c?c=xr(c):c||t===h||(c=Rr(u,t)),r&&(m=true,a=n.apply(l,o)),!m||c||i||(o=l=null),a}}function Mt(n,t,r){var e=arguments,u=0,o=typeof r=="number"?2:e.length;if(3<o&&"function"==typeof e[o-2])var i=N(e[--o-1],e[o--],2);
else 2<o&&"function"==typeof e[o-1]&&(i=e[--o]);for(;++u<o;)if(t=e[u],Qt(t))for(var a=-1,f=ee(t),l=f.length;++a<l;){var c=f[a];n[c]=i?i(n[c],t[c]):t[c]}return n}function Ut(n,t,r){for(var e=arguments,u=0,o=typeof r=="number"?2:e.length;++u<o;)if(t=e[u],Qt(t))for(var i=-1,a=ee(t),f=a.length;++i<f;){var l=a[i];"undefined"==typeof n[l]&&(n[l]=t[l])}return n}function Vt(n,t,r){var e=-1,u=ee(n),o=u.length;for(t=t&&typeof r=="undefined"?t:N(t,r,3);++e<o&&(r=u[e],false!==t(n[r],r,n)););return n}function Xt(n,t,r){var e=ee(n),u=e.length;
if(!Jt(n))throw new gr;if(t=zr(0,t)||0,true===r)var g=true,v=false;else Qt(r)&&(g=r.leading,h="maxWait"in r&&(zr(t,r.maxWait)||0),v="trailing"in r?r.trailing:v);return function(){if(o=arguments,f=ae(),l=this,p=v&&(c||!g),false===h)var r=g&&!c;else{i||g||(s=f);var y=h-(f-s),m=0>=y;m?(i&&(i=xr(i)),s=f,a=n.apply(l,o)):i||(i=Rr(e,y))}return m&&c?c=xr(c):c||t===h||(c=Rr(u,t)),r&&(m=true,a=n.apply(l,o)),!m||c||i||(o=l=null),a}}function Mt(n,t){var r=arguments,e=0,u=r[3]&&r[3][r[2]]===t?2:r.length;if(3<u&&"function"==typeof r[u-2])var o=N(r[--u-1],r[u--],2);
else 2<u&&"function"==typeof r[u-1]&&(o=r[--u]);for(;++e<u;)if(t=r[e],Qt(t))for(var i=-1,a=ee(t),f=a.length;++i<f;){var l=a[i];n[l]=o?o(n[l],t[l]):t[l]}return n}function Ut(n,t){for(var r=arguments,e=0,u=r[3]&&r[3][r[2]]===t?2:r.length;++e<u;)if(t=r[e],Qt(t))for(var o=-1,i=ee(t),a=i.length;++o<a;){var f=i[o];"undefined"==typeof n[f]&&(n[f]=t[f])}return n}function Vt(n,t,r){var e=-1,u=ee(n),o=u.length;for(t=t&&typeof r=="undefined"?t:N(t,r,3);++e<o&&(r=u[e],false!==t(n[r],r,n)););return n}function Xt(n,t,r){var e=ee(n),u=e.length;
for(t=N(t,r,3);u--&&(r=e[u],false!==t(n[r],r,n)););return n}function Gt(n){var t=[];return e(n,function(n,r){Jt(n)&&t.push(r)}),t.sort()}function Ht(n){return n&&typeof n=="object"&&1===n.nodeType&&-1<wr.call(n).indexOf("Element")||false}function Jt(n){return typeof n=="function"}function Qt(n){return!(!n||!at[typeof n])}function Yt(n){return typeof n=="number"||n&&typeof n=="object"&&wr.call(n)==Y||false}function Zt(n){return typeof n=="string"||n&&typeof n=="object"&&wr.call(n)==tt||false}function nr(n){for(var t=-1,r=ee(n),e=r.length,u=ir(e);++t<e;)u[t]=n[r[t]];
return u}function tr(n){return n}function rr(n){n||(n={});var t=ee(n),r=t[0],e=n[r];return 1!=t.length||e!==e||Qt(e)?function(r){for(var e=t.length,u=false;e--&&(u=ct(r[t[e]],n[t[e]],null,true)););return u}:function(n){return n=n[r],e===n&&(0!==e||1/e==1/n)}}function er(n,t,r){var e=true,u=t&&Gt(t);t&&(r||u.length)||(null==r&&(r=t),t=n,n=i,u=Gt(t)),false===r?e=false:Qt(r)&&"chain"in r&&(e=r.chain),r=-1;for(var o=Jt(n),a=u?u.length:0;++r<a;){var f=u[r],l=n[f]=t[f];o&&(n.prototype[f]=function(t){return function(){var r=this.__chain__,u=this.__wrapped__,o=[u];
if(Nr.apply(o,arguments),o=t.apply(n,o),e||r){if(u===o&&Qt(o))return this;o=new n(o),o.__chain__=r}return o}}(l))}}function ur(){}function or(n){return function(t){return t[n]}}n=n?ht.defaults(lt.Object(),n,ht.pick(lt,V)):lt;var ir=n.Array,ar=n.Boolean,fr=n.Date,lr=n.Function,cr=n.Math,pr=n.Number,sr=n.Object,hr=n.RegExp,vr=n.String,gr=n.TypeError,yr=ir.prototype,mr=sr.prototype,br=vr.prototype,dr=(dr=n.window)&&dr.document,_r=n._,wr=mr.toString,jr=hr("^"+vr(wr).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),kr=cr.ceil,xr=n.clearTimeout,Cr=cr.floor,Or=lr.prototype.toString,Ar=bt(Ar=sr.getPrototypeOf)&&Ar,Er=mr.hasOwnProperty,Nr=yr.push,Rr=n.setTimeout,Ir=yr.splice,Sr=yr.unshift,Tr=function(){try{var n={},t=bt(t=sr.defineProperty)&&t,r=t(n,n,n)&&t
}catch(e){}return r}(),Dr=bt(Dr=br.contains)&&Dr,Fr=bt(Fr=sr.create)&&Fr,$r=bt($r=ir.isArray)&&$r,Br=n.isFinite,qr=n.isNaN,Wr=bt(Wr=sr.keys)&&Wr,zr=cr.max,Lr=cr.min,Pr=n.parseInt,Kr=cr.random,Mr=bt(Mr=br.trim)&&!Mr.call(R)&&Mr,Ur=bt(Ur=br.trimLeft)&&!Ur.call(R)&&Ur,Vr=bt(Vr=br.trimRight)&&!Vr.call(R)&&Vr,Xr={};Xr[G]=ir,Xr[H]=ar,Xr[J]=fr,Xr[Q]=lr,Xr[Z]=sr,Xr[Y]=pr,Xr[nt]=hr,Xr[tt]=vr,d.prototype=i.prototype;var Gr=i.support={};Gr.funcDecomp=!bt(n.WinRTError)&&M.test(j),Gr.funcNames=typeof lr.name=="string";
try{Gr.dom=11===dr.createDocumentFragment().nodeType}catch(Hr){Gr.dom=false}i.templateSettings={escape:$,evaluate:B,interpolate:q,variable:"",imports:{_:i}},Fr||(C=function(){function t(){}return function(r){if(Qt(r)){t.prototype=r;var e=new t;t.prototype=null}return e||n.Object()}}());var Jr=Tr?function(n,t){ut.value=t,Tr(n,"__bindData__",ut)}:ur,Qr=gt(function(n,t,r){Er.call(n,r)?n[r]++:n[r]=1}),Yr=gt(function(n,t,r){Er.call(n,r)?n[r].push(t):n[r]=[t]}),Zr=gt(function(n,t,r){n[r]=t}),ne=$t,te=$r||function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&wr.call(n)==G||false
};Gr.dom||(Ht=function(n){return n&&typeof n=="object"&&1===n.nodeType&&!re(n)||false});var re=Ar?function(n){if(!n||wr.call(n)!=Z)return false;var t=n.valueOf,r=bt(t)&&(r=Ar(t))&&Ar(r);return r?n==r||Ar(n)==r:dt(n)}:dt,ee=Wr?function(n){return Qt(n)?Wr(n):[]}:o,ue=Mr?function(n,t){return null==n?"":null==t?Mr.call(n):y(n,t)}:y,oe=Ur?function(n,t){return null==n?"":null==t?Ur.call(n):m(n,t)}:m,ie=Vr?function(n,t){return null==n?"":null==t?Vr.call(n):b(n,t)}:b,ae=bt(ae=fr.now)&&ae||function(){return(new fr).getTime()
if(Nr.apply(o,arguments),o=t.apply(n,o),e||r){if(u===o&&Qt(o))return this;o=new n(o),o.__chain__=r}return o}}(l))}}function ur(){}function or(n){return function(t){return t[n]}}n=n?ht.defaults(lt.Object(),n,ht.pick(lt,V)):lt;var ir=n.Array,ar=n.Boolean,fr=n.Date,lr=n.Function,cr=n.Math,pr=n.Number,sr=n.Object,hr=n.RegExp,vr=n.String,gr=n.TypeError,yr=ir.prototype,mr=sr.prototype,dr=vr.prototype,br=(br=n.window)&&br.document,_r=n._,wr=mr.toString,jr=hr("^"+vr(wr).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString|(function).*?(?=\\\()| for .+?(?=\\\])/g,"$1.*?")+"$"),kr=cr.ceil,xr=n.clearTimeout,Cr=cr.floor,Or=lr.prototype.toString,Ar=dt(Ar=sr.getPrototypeOf)&&Ar,Er=mr.hasOwnProperty,Nr=yr.push,Rr=n.setTimeout,Ir=yr.splice,Sr=yr.unshift,Tr=function(){try{var n={},t=dt(t=sr.defineProperty)&&t,r=t(n,n,n)&&t
}catch(e){}return r}(),Dr=dt(Dr=dr.contains)&&Dr,Fr=dt(Fr=sr.create)&&Fr,$r=dt($r=ir.isArray)&&$r,Br=n.isFinite,qr=n.isNaN,Wr=dt(Wr=sr.keys)&&Wr,zr=cr.max,Lr=cr.min,Pr=n.parseInt,Kr=cr.random,Mr=dt(Mr=dr.trim)&&!Mr.call(R)&&Mr,Ur=dt(Ur=dr.trimLeft)&&!Ur.call(R)&&Ur,Vr=dt(Vr=dr.trimRight)&&!Vr.call(R)&&Vr,Xr={};Xr[G]=ir,Xr[H]=ar,Xr[J]=fr,Xr[Q]=lr,Xr[Z]=sr,Xr[Y]=pr,Xr[nt]=hr,Xr[tt]=vr,b.prototype=i.prototype;var Gr=i.support={};Gr.funcDecomp=!dt(n.WinRTError)&&M.test(j),Gr.funcNames=typeof lr.name=="string";
try{Gr.dom=11===br.createDocumentFragment().nodeType}catch(Hr){Gr.dom=false}i.templateSettings={escape:$,evaluate:B,interpolate:q,variable:"",imports:{_:i}},Fr||(C=function(){function t(){}return function(r){if(Qt(r)){t.prototype=r;var e=new t;t.prototype=null}return e||n.Object()}}());var Jr=Tr?function(n,t){ut.value=t,Tr(n,"__bindData__",ut)}:ur,Qr=gt(function(n,t,r){Er.call(n,r)?n[r]++:n[r]=1}),Yr=gt(function(n,t,r){Er.call(n,r)?n[r].push(t):n[r]=[t]}),Zr=gt(function(n,t,r){n[r]=t}),ne=$t,te=$r||function(n){return n&&typeof n=="object"&&typeof n.length=="number"&&wr.call(n)==G||false
};Gr.dom||(Ht=function(n){return n&&typeof n=="object"&&1===n.nodeType&&!re(n)||false});var re=Ar?function(n){if(!n||wr.call(n)!=Z)return false;var t=n.valueOf,r=dt(t)&&(r=Ar(t))&&Ar(r);return r?n==r||Ar(n)==r:bt(n)}:bt,ee=Wr?function(n){return Qt(n)?Wr(n):[]}:o,ue=Mr?function(n,t){return null==n?"":null==t?Mr.call(n):y(n,t)}:y,oe=Ur?function(n,t){return null==n?"":null==t?Ur.call(n):m(n,t)}:m,ie=Vr?function(n,t){return null==n?"":null==t?Vr.call(n):d(n,t)}:d,ae=dt(ae=fr.now)&&ae||function(){return(new fr).getTime()
},fe=8==Pr(R+"08")?Pr:function(n,t){return n=ue(n),Pr(n,+t||(P.test(n)?16:10))};return i.after=function(n,t){if(!Jt(t))throw new gr;return function(){return 1>--n?t.apply(this,arguments):void 0}},i.assign=Mt,i.at=function(n){for(var t=arguments,r=-1,e=ft(t,true,false,1),t=t[2]&&t[2][t[1]]===n?1:e.length,u=ir(t);++r<t;)u[r]=n[e[r]];return u},i.bind=Pt,i.bindAll=function(n){for(var t=1<arguments.length?ft(arguments,true,false,1):Gt(n),r=-1,e=t.length;++r<e;){var u=t[r];n[u]=yt(n[u],1,null,null,n)}return n},i.bindKey=function(n,t){return 2<arguments.length?yt(t,19,xt(arguments,2),null,n):yt(t,3,null,null,n)
},i.chain=function(n){return n=new d(n),n.__chain__=true,n},i.compact=function(n){for(var t=-1,r=n?n.length:0,e=0,u=[];++t<r;){var o=n[t];o&&(u[e++]=o)}return u},i.compose=function(){for(var n=arguments,t=n.length;t--;)if(!Jt(n[t]))throw new gr;return function(){for(var t=arguments,r=n.length;r--;)t=[n[r].apply(this,t)];return t[0]}},i.constant=function(n){return function(){return n}},i.countBy=Qr,i.create=function(n,t){var r=C(n);return t?Mt(r,t):r},i.createCallback=function(n,t,r){var e=typeof n;
},i.chain=function(n){return n=new b(n),n.__chain__=true,n},i.compact=function(n){for(var t=-1,r=n?n.length:0,e=0,u=[];++t<r;){var o=n[t];o&&(u[e++]=o)}return u},i.compose=function(){for(var n=arguments,t=n.length;t--;)if(!Jt(n[t]))throw new gr;return function(){for(var t=arguments,r=n.length;r--;)t=[n[r].apply(this,t)];return t[0]}},i.constant=function(n){return function(){return n}},i.countBy=Qr,i.create=function(n,t){var r=C(n);return t?Mt(r,t):r},i.createCallback=function(n,t,r){var e=typeof n;
return null==n||"function"==e?N(n,t,r):"object"!=e?or(n):rr(n)},i.curry=function(n,t){return t=typeof t=="number"?t:+t||n.length,yt(n,4,null,null,null,t)},i.debounce=Kt,i.defaults=Ut,i.defer=function(n){if(!Jt(n))throw new gr;var t=xt(arguments,1);return Rr(function(){n.apply(k,t)},1)},i.delay=function(n,t){if(!Jt(n))throw new gr;var r=xt(arguments,2);return Rr(function(){n.apply(k,r)},t)},i.difference=function(n){return it(n,ft(arguments,true,true,1))},i.filter=St,i.flatten=function(n,t,r,e){return typeof t!="boolean"&&null!=t&&(e=r,r=typeof t!="function"&&e&&e[t]===n?null:t,t=false),null!=r&&(n=$t(n,r,e)),ft(n,t)
},i.forEach=Dt,i.forEachRight=Ft,i.forIn=e,i.forInRight=function(n,t,r){var u=[];e(n,function(n,t){u.push(t,n)});var o=u.length;for(t=N(t,r,3);o--&&false!==t(u[o--],u[o],n););return n},i.forOwn=Vt,i.forOwnRight=Xt,i.functions=Gt,i.groupBy=Yr,i.indexBy=Zr,i.initial=function(n,t,r){var e=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=u;for(t=i.createCallback(t,r,3);o--&&t(n[o],o,n);)e++}else e=null==t||r?1:t||e;return e=u-e,xt(n,0,0<e?e:0)},i.intersection=function(){for(var n=[],e=-1,u=arguments.length,o=s(),i=mt(),a=i===t,f=s();++e<u;){var c=arguments[e];
(te(c)||_t(c))&&(n.push(c),o.push(a&&c.length>=E&&l(e?n[e]:f)))}var a=n[0],p=-1,h=a?a.length:0,y=[];n:for(;++p<h;){var m=o[0],c=a[p];if(0>(m?r(m,c):i(f,c))){for(e=u,(m||f).push(c);--e;)if(m=o[e],0>(m?r(m,c):i(n[e],c)))continue n;y.push(c)}}for(;u--;)(m=o[u])&&g(m);return v(o),v(f),y},i.invert=function(n,t){for(var r=-1,e=ee(n),u=e.length,o={};++r<u;){var i=e[r],a=n[i];t&&Er.call(o,a)?("string"==typeof o[a]&&(o[a]=[o[a]]),o[a].push(i)):o[a]=i}return o},i.invoke=function(n,t){var r=xt(arguments,2),e=-1,u=typeof t=="function",o=n?n.length:0,i=ir(typeof o=="number"?o:0);
@@ -52,7 +52,7 @@ l in n&&(u[l]=n[l])}else t=i.createCallback(t,r,3),e(n,function(n,r,e){t(n,r,e)&
},i.reduce=qt,i.reduceRight=Wt,i.result=function(n,t){if(n){var r=n[t];return Jt(r)?n[t]():r}},i.runInContext=j,i.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:ee(n).length},i.some=Lt,i.sortedIndex=Ct,i.template=function(n,t,r){var e=i.templateSettings;n=vr(n||""),r=Ut({},r,e);var u,o=Ut({},r.imports,e.imports),e=ee(o),o=nr(o),a=0,f=r.interpolate||K,l="__p+='",f=hr((r.escape||K).source+"|"+f.source+"|"+(f===q?W:K).source+"|"+(r.evaluate||K).source+"|$","g");n.replace(f,function(t,r,e,o,i,f){return e||(e=o),l+=n.slice(a,f).replace(U,p),r&&(l+="'+__e("+r+")+'"),i&&(u=true,l+="';"+i+";\n__p+='"),e&&(l+="'+((__t=("+e+"))==null?'':__t)+'"),a=f+t.length,t
}),l+="';",f=r=r.variable,f||(r="obj",l="with("+r+"){"+l+"}"),l=(u?l.replace(I,""):l).replace(S,"$1").replace(T,"$1;"),l="function("+r+"){"+(f?"":r+"||("+r+"={});")+"var __t,__p='',__e=_.escape"+(u?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+l+"return __p}";try{var c=lr(e,"return "+l).apply(k,o)}catch(s){throw s.source=l,s}return t?c(t):(c.source=l,c)},i.trim=ue,i.trimLeft=oe,i.trimRight=ie,i.unescape=function(n){return null==n?"":(n=vr(n),0>n.indexOf(";")?n:n.replace(D,w))
},i.uniqueId=function(n){var t=++O;return vr(null==n?"":n)+t},i.all=It,i.any=Lt,i.detect=Tt,i.findWhere=Tt,i.foldl=qt,i.foldr=Wt,i.include=Rt,i.inject=qt,er(function(){var n={};return Vt(i,function(t,r){i.prototype[r]||(n[r]=t)}),n}(),false),i.first=wt,i.last=function(n,t,r){var e=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=u;for(t=i.createCallback(t,r,3);o--&&t(n[o],o,n);)e++}else if(e=t,null==e||r)return n?n[u-1]:k;return e=u-e,xt(n,0<e?e:0)},i.sample=function(n,t,r){return n&&typeof n.length!="number"&&(n=nr(n)),null==t||r?n?n[st(0,n.length-1)]:k:(n=zt(n),n.length=Lr(zr(0,t),n.length),n)
},i.take=wt,i.head=wt,Vt(i,function(n,t){var r="sample"!==t;i.prototype[t]||(i.prototype[t]=function(t,e){var u=this.__chain__,o=n(this.__wrapped__,t,e);return u||null!=t&&(!e||r&&typeof t=="function")?new d(o,u):o})}),i.VERSION="2.4.1",i.prototype.chain=function(){return this.__chain__=true,this},i.prototype.toString=function(){return vr(this.__wrapped__)},i.prototype.value=Nt,i.prototype.valueOf=Nt,Dt(["join","pop","shift"],function(n){var t=yr[n];i.prototype[n]=function(){var n=this.__chain__,r=t.apply(this.__wrapped__,arguments);
return n?new d(r,n):r}}),Dt(["push","reverse","sort","unshift"],function(n){var t=yr[n];i.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),Dt(["concat","splice"],function(n){var t=yr[n];i.prototype[n]=function(){return new d(t.apply(this.__wrapped__,arguments),this.__chain__)}}),i}var k,x=[],C=[],O=0,A="__1335248838000__",E=75,N=40,R=" \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",I=/\b__p\+='';/g,S=/\b(__p\+=)''\+/g,T=/(__e\(.*?\)|\b__t\))\+'';/g,D=/&(?:amp|lt|gt|quot|#39);/g,F=/[&<>"']/g,$=/<%-([\s\S]+?)%>/g,B=/<%([\s\S]+?)%>/g,q=/<%=([\s\S]+?)%>/g,W=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,z=/\w*$/,L=/^\s*function[ \n\r\t]+\w/,P=/^0[xX]/,K=/($^)/,M=/\bthis\b/,U=/['\n\r\t\u2028\u2029\\]/g,V="Array Boolean Date Function Math Number Object RegExp String _ clearTimeout document isFinite isNaN parseInt setTimeout TypeError window WinRTError".split(" "),X="[object Arguments]",G="[object Array]",H="[object Boolean]",J="[object Date]",Q="[object Function]",Y="[object Number]",Z="[object Object]",nt="[object RegExp]",tt="[object String]",rt={};
},i.take=wt,i.head=wt,Vt(i,function(n,t){var r="sample"!==t;i.prototype[t]||(i.prototype[t]=function(t,e){var u=this.__chain__,o=n(this.__wrapped__,t,e);return u||null!=t&&(!e||r&&typeof t=="function")?new b(o,u):o})}),i.VERSION="2.4.1",i.prototype.chain=function(){return this.__chain__=true,this},i.prototype.toString=function(){return vr(this.__wrapped__)},i.prototype.value=Nt,i.prototype.valueOf=Nt,Dt(["join","pop","shift"],function(n){var t=yr[n];i.prototype[n]=function(){var n=this.__chain__,r=t.apply(this.__wrapped__,arguments);
return n?new b(r,n):r}}),Dt(["push","reverse","sort","unshift"],function(n){var t=yr[n];i.prototype[n]=function(){return t.apply(this.__wrapped__,arguments),this}}),Dt(["concat","splice"],function(n){var t=yr[n];i.prototype[n]=function(){return new b(t.apply(this.__wrapped__,arguments),this.__chain__)}}),i}var k,x=[],C=[],O=0,A="__1335248838000__",E=75,N=40,R=" \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",I=/\b__p\+='';/g,S=/\b(__p\+=)''\+/g,T=/(__e\(.*?\)|\b__t\))\+'';/g,D=/&(?:amp|lt|gt|quot|#39);/g,F=/[&<>"']/g,$=/<%-([\s\S]+?)%>/g,B=/<%([\s\S]+?)%>/g,q=/<%=([\s\S]+?)%>/g,W=/\$\{([^\\}]*(?:\\.[^\\}]*)*)\}/g,z=/\w*$/,L=/^\s*function[ \n\r\t]+\w/,P=/^0[xX]/,K=/($^)/,M=/\bthis\b/,U=/['\n\r\t\u2028\u2029\\]/g,V="Array Boolean Date Function Math Number Object RegExp String _ clearTimeout document isFinite isNaN parseInt setTimeout TypeError window WinRTError".split(" "),X="[object Arguments]",G="[object Array]",H="[object Boolean]",J="[object Date]",Q="[object Function]",Y="[object Number]",Z="[object Object]",nt="[object RegExp]",tt="[object String]",rt={};
rt[Q]=false,rt[X]=rt[G]=rt[H]=rt[J]=rt[Y]=rt[Z]=rt[nt]=rt[tt]=true;var et={leading:false,maxWait:0,trailing:false},ut={configurable:false,enumerable:false,value:null,writable:false},ot={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;"},it={"&amp;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#39;":"'"},at={"boolean":false,"function":true,object:true,number:false,string:false,undefined:false},ft={"\\":"\\","'":"'","\n":"n","\r":"r","\t":"t","\u2028":"u2028","\u2029":"u2029"},lt=at[typeof window]&&window||this,ct=at[typeof exports]&&exports&&!exports.nodeType&&exports,pt=at[typeof global]&&global;
!pt||pt.global!==pt&&pt.window!==pt||(lt=pt);var st=(pt=at[typeof module]&&module&&!module.nodeType&&module)&&pt.exports===ct&&ct,ht=j();typeof define=="function"&&typeof define.amd=="object"&&define.amd?(lt._=ht, define(function(){return ht})):ct&&pt?st?(pt.exports=ht)._=ht:ct._=ht:lt._=ht}).call(this);

View File

@@ -3041,6 +3041,9 @@
* binding of `thisArg` and prepends any additional `bind` arguments to those
* provided to the bound function.
*
* Note: Unlike native `Function#bind` this method does not set the `length`
* property of bound functions.
*
* @static
* @memberOf _
* @category Functions
@@ -3070,6 +3073,8 @@
* of method names. If no method names are provided all the function properties
* of `object` will be bound.
*
* Note: This method does not set the `length` property of bound functions.
*
* @static
* @memberOf _
* @category Functions
@@ -3426,6 +3431,9 @@
* `partial` arguments prepended to those provided to the new function. This
* method is similar to `_.bind` except it does **not** alter the `this` binding.
*
* Note: This method does not set the `length` property of partially applied
* functions.
*
* @static
* @memberOf _
* @category Functions
@@ -3622,8 +3630,6 @@
* @category Objects
* @param {Object} object The destination object.
* @param {...Object} [source] The source objects.
* @param- {Object} [guard] Allows working with `_.reduce` without using its
* `key` and `object` arguments as sources.
* @returns {Object} Returns the destination object.
* @example
*
@@ -3973,8 +3979,8 @@
/**
* Checks if `value` is, or can be coerced to, a finite number.
*
* Note: This is not the same as native `isFinite` which will return true for
* booleans and empty strings. See the [ES5 spec](http://es5.github.io/#x15.1.2.5)
* Note: This method is not the same as native `isFinite` which will return
* `true` for booleans and empty strings. See the [ES5 spec](http://es5.github.io/#x15.1.2.5)
* for more details.
*
* @static
@@ -4057,8 +4063,8 @@
/**
* Checks if `value` is `NaN`.
*
* Note: This is not the same as native `isNaN` which will return `true` for
* `undefined` and other non-numeric values. See the [ES5 spec](http://es5.github.io/#x15.1.2.4)
* Note: This method is not the same as native `isNaN` which will return `true`
* for `undefined` and other non-numeric values. See the [ES5 spec](http://es5.github.io/#x15.1.2.4)
* for more details.
*
* @static