From 400b6fbb610580e9ee09da473aabe6b7d2c01359 Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Sat, 20 Oct 2012 13:02:14 -0700 Subject: [PATCH] Sync `_.isFinite` changes with Underscore and update vendor/underscore and vendor/backbone. Former-commit-id: 9acb93a276a11da8186da76bd82f1fd6f89c27dd --- lodash.js | 3 +- lodash.min.js | 61 +++++++++++++++-------------- lodash.underscore.min.js | 52 ++++++++++++------------ vendor/backbone/backbone.js | 32 +++++++-------- vendor/backbone/test/model.js | 11 ++++++ vendor/backbone/test/router.js | 11 ++++++ vendor/backbone/test/sync.js | 24 ++++++++++++ vendor/benchmark.js/benchmark.js | 41 +++++++++++++++++-- vendor/underscore/test/objects.js | 4 +- vendor/underscore/underscore-min.js | 2 +- vendor/underscore/underscore.js | 2 +- 11 files changed, 163 insertions(+), 80 deletions(-) diff --git a/lodash.js b/lodash.js index 8186f4bf1..ecccec61a 100644 --- a/lodash.js +++ b/lodash.js @@ -84,6 +84,7 @@ var nativeBind = reNative.test(nativeBind = slice.bind) && nativeBind, nativeIsArray = reNative.test(nativeIsArray = Array.isArray) && nativeIsArray, nativeIsFinite = window.isFinite, + nativeIsNaN = window.isNaN, nativeKeys = reNative.test(nativeKeys = Object.keys) && nativeKeys, nativeMax = Math.max, nativeMin = Math.min, @@ -1406,7 +1407,7 @@ * // => false */ function isFinite(value) { - return nativeIsFinite(value) && toString.call(value) == numberClass; + return nativeIsFinite(value) && !nativeIsNaN(parseFloat(value)); } /** diff --git a/lodash.min.js b/lodash.min.js index 32009f3bf..cbe8a58eb 100644 --- a/lodash.min.js +++ b/lodash.min.js @@ -3,37 +3,38 @@ Underscore.js 1.4.2 underscorejs.org/LICENSE */ ;(function(e,t){function s(e){if(e&&e.__wrapped__)return e;if(!(this instanceof s))return new s(e);this.__wrapped__=e}function o(e,t,n){t||(t=0);var r=e.length,i=r-t>=(n||J),s=i?{}:e;if(i)for(n=t-1;++nn||e===t)return 1;if(ei;i++)r+="h='"+e.m[i]+"';if(","constructor"==e.m[i]&&(r+="!(f&&f.prototype===i)&&"),r+="g.call(i,h)){u=i[h];"+e.j+"}"}if(e.c||e.k)r+="}"}return r+=e.d+";return p",Function("v,e,x,g,y,z,A,k,o,r,t","return function("+ -t+"){"+r+"}")(R,f,w,ht,v,m,Xt,wt,dt,Mt,mt)}function c(e){return"\\"+Vt[e]}function h(e){return en[e]}function p(){}function d(e){return tn[e]}function v(e){return mt.call(e)==Tt}function m(e){return"function"==typeof e}function g(e){var t=i;if(!e||"object"!=typeof e||v(e))return t;var n=e.constructor;return(!It||"function"==typeof e.toString||"string"!=typeof (e+""))&&(!m(n)||n instanceof n)?Dt?(Qt(e,function(e,n,r){return t=!ht.call(r,n),i}),t===i):(Qt(e,function(e,n){t=n}),t===i||ht.call(e,t)): -t}function y(e){var t=[];return Gt(e,function(e,n){t.push(n)}),t}function b(e,t,n,s,o){if(e==r)return e;n&&(t=i);if(n=Xt[typeof e]){var u=mt.call(e);if(!Wt[u]||Bt&&v(e))return e;var a=u==Nt,n=a||(u==At?Zt(e):n)}if(!n||!t)return n?a?vt.call(e):rn({},e):e;n=e.constructor;switch(u){case Ct:case kt:return new n(+e);case Lt:case Mt:return new n(e);case Ot:return n(e.source,tt.exec(e))}s||(s=[]),o||(o=[]);for(u=s.length;u--;)if(s[u]==e)return o[u];var f=a?n(e.length):{};return s.push(e),o.push(f),(a?on -:Gt)(e,function(e,n){f[n]=b(e,t,r,s,o)}),f}function w(e){var t=[];return Qt(e,function(e,n){m(e)&&t.push(n)}),t.sort()}function E(e){var t={};return Gt(e,function(e,n){t[e]=n}),t}function S(e,t,s,o){if(e===t)return 0!==e||1/e==1/t;if(e==r||t==r)return e===t;var u=mt.call(e);if(u!=mt.call(t))return i;switch(u){case Ct:case kt:return+e==+t;case Lt:return e!=+e?t!=+t:0==e?1/e==1/t:e==+t;case Ot:case Mt:return e==t+""}var a=u==Nt||u==Tt;if(Bt&&!a&&(a=v(e))&&!v(t))return i;if(!a){if(e.__wrapped__||t.__wrapped__ -)return S(e.__wrapped__||e,t.__wrapped__||t);if(u!=At||It&&("function"!=typeof e.toString&&"string"==typeof (e+"")||"function"!=typeof t.toString&&"string"==typeof (t+"")))return i;var u=e.constructor,f=t.constructor;if(u!=f&&(!m(u)||!(u instanceof u&&m(f)&&f instanceof f)))return i}s||(s=[]),o||(o=[]);for(u=s.length;u--;)if(s[u]==e)return o[u]==t;var u=-1,f=n,l=0;s.push(e),o.push(t);if(a){l=e.length;if(f=l==t.length)for(;l--&&(f=S(e[l],t[l],s,o)););return f}for(var c in e)if(ht.call(e,c)&&(l++,! -ht.call(t,c)||!S(e[c],t[c],s,o)))return i;for(c in t)if(ht.call(t,c)&&!(l--))return i;if(_t)for(;7>++u;)if(c=ut[u],ht.call(e,c)&&(!ht.call(t,c)||!S(e[c],t[c],s,o)))return i;return n}function x(e,t,n){var i=arguments,s=0,o=2,a=i[3],f=i[4];n!=u&&(a=[],f=[],o=i.length);for(;++sr&&(r=n,o=e)});else for(;++io&&(o=e[i]);return o}function M(e,t){var n=[];return on(e,function(e){n.push(e[t])}),n}function _(e,t,n,r){var s=3>arguments.length,t=f(t,r);return on(e,function(e,r,o){n=s?(s=i,e):t(n,e,r,o)}),n}function D(e,t,n,r){var s=e,o=e?e.length:0,u=3>arguments.length -;if(o!==+o)var a=sn(e),o=a.length;else Ft&&mt.call(e)==Mt&&(s=e.split(""));return on(e,function(e,f,l){f=a?a[--o]:--o,n=u?(u=i,s[f]):t.call(r,n,s[f],f,l)}),n}function P(e,t,n){var r,t=f(t,n);return on(e,function(e,n,i){return!(r=t(e,n,i))}),!!r}function H(e,t,n){if(e)return t==r||n?e[0]:vt.call(e,0,t)}function B(e,t){for(var n=-1,r=e?e.length:0,i=[];++nn?Et(0,i+n):n||0 +t+"){"+r+"}")(R,f,w,ht,v,m,Vt,Et,dt,_t,mt)}function c(e){return"\\"+$t[e]}function h(e){return tn[e]}function p(){}function d(e){return nn[e]}function v(e){return mt.call(e)==Nt}function m(e){return"function"==typeof e}function g(e){var t=i;if(!e||"object"!=typeof e||v(e))return t;var n=e.constructor;return(!qt||"function"==typeof e.toString||"string"!=typeof (e+""))&&(!m(n)||n instanceof n)?Pt?(Gt(e,function(e,n,r){return t=!ht.call(r,n),i}),t===i):(Gt(e,function(e,n){t=n}),t===i||ht.call(e,t)): +t}function y(e){var t=[];return Yt(e,function(e,n){t.push(n)}),t}function b(e,t,n,s,o){if(e==r)return e;n&&(t=i);if(n=Vt[typeof e]){var u=mt.call(e);if(!Xt[u]||jt&&v(e))return e;var a=u==Ct,n=a||(u==Ot?en(e):n)}if(!n||!t)return n?a?vt.call(e):sn({},e):e;n=e.constructor;switch(u){case kt:case Lt:return new n(+e);case At:case _t:return new n(e);case Mt:return n(e.source,tt.exec(e))}s||(s=[]),o||(o=[]);for(u=s.length;u--;)if(s[u]==e)return o[u];var f=a?n(e.length):{};return s.push(e),o.push(f),(a?un +:Yt)(e,function(e,n){f[n]=b(e,t,r,s,o)}),f}function w(e){var t=[];return Gt(e,function(e,n){m(e)&&t.push(n)}),t.sort()}function E(e){var t={};return Yt(e,function(e,n){t[e]=n}),t}function S(e,t,s,o){if(e===t)return 0!==e||1/e==1/t;if(e==r||t==r)return e===t;var u=mt.call(e);if(u!=mt.call(t))return i;switch(u){case kt:case Lt:return+e==+t;case At:return e!=+e?t!=+t:0==e?1/e==1/t:e==+t;case Mt:case _t:return e==t+""}var a=u==Ct||u==Nt;if(jt&&!a&&(a=v(e))&&!v(t))return i;if(!a){if(e.__wrapped__||t.__wrapped__ +)return S(e.__wrapped__||e,t.__wrapped__||t);if(u!=Ot||qt&&("function"!=typeof e.toString&&"string"==typeof (e+"")||"function"!=typeof t.toString&&"string"==typeof (t+"")))return i;var u=e.constructor,f=t.constructor;if(u!=f&&(!m(u)||!(u instanceof u&&m(f)&&f instanceof f)))return i}s||(s=[]),o||(o=[]);for(u=s.length;u--;)if(s[u]==e)return o[u]==t;var u=-1,f=n,l=0;s.push(e),o.push(t);if(a){l=e.length;if(f=l==t.length)for(;l--&&(f=S(e[l],t[l],s,o)););return f}for(var c in e)if(ht.call(e,c)&&(l++,! +ht.call(t,c)||!S(e[c],t[c],s,o)))return i;for(c in t)if(ht.call(t,c)&&!(l--))return i;if(Dt)for(;7>++u;)if(c=ut[u],ht.call(e,c)&&(!ht.call(t,c)||!S(e[c],t[c],s,o)))return i;return n}function x(e,t,n){var i=arguments,s=0,o=2,a=i[3],f=i[4];n!=u&&(a=[],f=[],o=i.length);for(;++sr&&(r=n,o=e)});else for(;++io&&(o=e[i]);return o}function M(e,t){var n=[];return un(e,function(e){n.push(e[t])}),n}function _(e,t,n,r){var s=3>arguments.length,t=f(t,r);return un(e,function(e,r,o){n=s?(s=i,e):t(n,e,r,o)}),n}function D(e,t,n,r){var s=e,o=e?e.length:0,u=3>arguments.length +;if(o!==+o)var a=on(e),o=a.length;else It&&mt.call(e)==_t&&(s=e.split(""));return un(e,function(e,f,l){f=a?a[--o]:--o,n=u?(u=i,s[f]):t.call(r,n,s[f],f,l)}),n}function P(e,t,n){var r,t=f(t,n);return un(e,function(e,n,i){return!(r=t(e,n,i))}),!!r}function H(e,t,n){if(e)return t==r||n?e[0]:vt.call(e,0,t)}function B(e,t){for(var n=-1,r=e?e.length:0,i=[];++nn?St(0,i+n):n||0 )-1;else if(n)return r=I(e,t),e[r]===t?r:-1;for(;++r>>1,n(e[r])>>1,e[r]j(a,r))a.push(r),u.push(e[s]);return u}function R(e,t) -{return Rt||gt&&2|{(\/]|\[\D|\b(?:delete|in|instanceof|new|typeof|void)\b/ +{return Ut||gt&&2|{(\/]|\[\D|\b(?:delete|in|instanceof|new|typeof|void)\b/ ,G=/&(?:amp|lt|gt|quot|#x27);/g,Y=/\b__p\+='';/g,Z=/\b(__p\+=)''\+/g,et=/(__e\(.*?\)|\b__t\))\+'';/g,tt=/\w*$/,nt=/(?:__e|__t=)\(\s*(?![\d\s"']|this\.)/g,rt=RegExp("^"+(V.valueOf+"").replace(/[.*+?^=!:${}()|[\]\/\\]/g,"\\$&").replace(/valueOf|for [^\]]+/g,".+?")+"$"),it=/($^)/,st=/[&<>"']/g,ot=/['\n\r\t\u2028\u2029\\]/g,ut="constructor hasOwnProperty isPrototypeOf propertyIsEnumerable toLocaleString toString valueOf".split(" "),at=Math.ceil,ft=X.concat,lt=Math.floor,ct=rt.test(ct=Object.getPrototypeOf -)&&ct,ht=V.hasOwnProperty,pt=X.push,dt=V.propertyIsEnumerable,vt=X.slice,mt=V.toString,gt=rt.test(gt=vt.bind)&>,yt=rt.test(yt=Array.isArray)&&yt,bt=e.isFinite,wt=rt.test(wt=Object.keys)&&wt,Et=Math.max,St=Math.min,xt=Math.random,Tt="[object Arguments]",Nt="[object Array]",Ct="[object Boolean]",kt="[object Date]",Lt="[object Number]",At="[object Object]",Ot="[object RegExp]",Mt="[object String]",_t,Dt,Pt=(Pt={0:1,length:1},X.splice.call(Pt,0,1),Pt[0]),Ht=n;(function(){function e(){this.x=1}var t= -[];e.prototype={valueOf:1,y:1};for(var n in new e)t.push(n);for(n in arguments)Ht=!n;_t=!/valueOf/.test(t),Dt="x"!=t[0]})(1);var Bt=!v(arguments),jt="x"!=vt.call("x")[0],Ft="xx"!="x"[0]+Object("x")[0];try{var It=("[object Object]",mt.call(e.document||0)==At)}catch(qt){}var Rt=gt&&/\n|Opera/.test(gt+mt.call(e.opera)),Ut=wt&&/^.+$|true/.test(wt+!!e.attachEvent),zt=!Rt,Wt={};Wt[Tt]=Wt["[object Function]"]=i,Wt[Nt]=Wt[Ct]=Wt[kt]=Wt[Lt]=Wt[At]=Wt[Ot]=Wt[Mt]=n;var Xt={"boolean":i,"function":n,object:n,number -:i,string:i,"undefined":i},Vt={"\\":"\\","'":"'","\n":"n","\r":"r"," ":"t","\u2028":"u2028","\u2029":"u2029"};s.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""};var $t={a:"d,c,s",n:"c=e(c,s)",h:"if(c(u,h,d)===false)return p"},Jt={o:i,p:i,a:"l",n:"for(var a=1,b=arguments.length;a":">",'"':""","'":"'"},tn=E(en),nn=l(Jt,{j:"if(p[h]==null)"+Jt.j}),rn=l(Jt),sn=wt?function(e){var t=typeof e;return"function"==t&&dt.call(e,"prototype")?y(e):e&&Xt[t]?wt(e):[]}:y,on=l($t),un=l({p:i,a:"l",n:"var w=arguments,h=w.length>1?0:(w=x(l),-1),j=w.length;while(++he?t():function(){if(1>--e)return t.apply(this,arguments)}},s.bind=R,s.bindAll=un,s.chain=function(e){return e=new s(e),e.__chain__=n,e},s.clone=b,s.compact=function(e){for(var t=-1,n=e?e.length:0,r=[];++tj(s,u)){for(var a=1;an?Et(0,r+n):St(n,r-1))+1);r--;)if(e[r]===t)return r;return-1},s.lateBind=function(e,t){return a(t,e,vt.call(arguments,2))},s.map=A,s.max=O,s.memoize=function(e,t){var n={ -};return function(){var r=t?t.apply(this,arguments):arguments[0];return ht.call(n,r)?n[r]:n[r]=e.apply(this,arguments)}},s.merge=x,s.min=function(e,t,n){var r=Infinity,i=-1,s=e?e.length:0,o=r;if(t||s!==+s)t=f(t,n),on(e,function(e,n,i){n=t(e,n,i),nj(s,n,1))i[n]=e}),i},s.once=function(e){var t,s=i;return function(){return s?t:(s=n,t=e.apply(this,arguments),e=r,t)}},s.pairs=function(e){var t=[];return Gt(e,function(e,n){t.push([n,e])}),t},s.partial=function(e){return a(e,vt.call(arguments,1))},s.pick=function(e,t,n){var r={};if("function"!=typeof t)for(var i=0,s=ft.apply(X,arguments),o=s.length;++i=f?(clearTimeout(u),a=r,s=e.apply(o,i)):u||(u=setTimeout(n,f)), -s}},s.times=function(e,t,n){for(var e=+e||0,r=-1,i=Array(e);++rj(r,i)&&r.push(i)}return r},s.uniq=q,s.uniqueId=function(e){var t=$++;return e?e+t:t},s.values=T,s.where=function(e,t){var n=[] -;Qt(t,function(e,t){n.push(t)});var r=n.length,i=[];return on(e,function(e){for(var s=-1;++s/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""};var Jt={a:"d,c,s",n:"c=e(c,s)",h:"if(c(u,h,d)===false)return p"},Kt={o:i,p:i,a:"l",n:"for(var a=1,b=arguments.length;a":">",'"':""","'":"'"},nn=E(tn),rn=l(Kt,{j:"if(p[h]==null)"+Kt.j}),sn=l(Kt),on=Et?function(e){var t=typeof e;return"function"==t&&dt.call(e,"prototype")?y(e):e&&Vt[t]?Et(e):[]}:y,un=l(Jt),an=l({p:i,a:"l", +n:"var w=arguments,h=w.length>1?0:(w=x(l),-1),j=w.length;while(++he?t():function(){if(1>--e)return t.apply(this,arguments)}},s.bind=R,s.bindAll=an,s.chain=function(e){return e=new s(e),e.__chain__=n,e},s.clone=b,s.compact=function(e){for(var t=-1,n=e?e.length:0,r=[];++tj(s,u)){for(var a=1;an?St(0,r+n):xt(n,r-1))+1);r--;)if(e[r]===t)return r;return-1 +},s.lateBind=function(e,t){return a(t,e,vt.call(arguments,2))},s.map=A,s.max=O,s.memoize=function(e,t){var n={};return function(){var r=t?t.apply(this,arguments):arguments[0];return ht.call(n,r)?n[r]:n[r]=e.apply(this,arguments)}},s.merge=x,s.min=function(e,t,n){var r=Infinity,i=-1,s=e?e.length:0,o=r;if(t||s!==+s)t=f(t,n),un(e,function(e,n,i){n=t(e,n,i),nj(s,n,1))i[n]=e}),i},s.once=function(e){var t,s=i;return function(){return s?t:(s=n,t=e.apply(this,arguments),e=r,t)}},s.pairs=function(e){var t=[];return Yt(e,function(e,n){t.push([n,e])}),t},s.partial=function(e){return a(e,vt.call(arguments,1))},s.pick=function(e,t,n){var r={ +};if("function"!=typeof t)for(var i=0,s=ft.apply(X,arguments),o=s.length;++i=f?(clearTimeout(u),a=r,s=e.apply(o,i)):u||(u=setTimeout(n,f)),s}},s.times=function(e,t,n){for(var e=+e||0,r=-1,i=Array(e);++rj(r,i)&&r +.push(i)}return r},s.uniq=q,s.uniqueId=function(e){var t=$++;return e?e+t:t},s.values=T,s.where=function(e,t){var n=[];Gt(t,function(e,t){n.push(t)});var r=n.length,i=[];return un(e,function(e){for(var s=-1;++sn||e===t)return 1;if(er&&(r=n,u=e)});else for(;++iu&&(u=e[i]);return u}function M(e,t){var n=[];return s(e,function(e){n.push(e[t])}),n}function _(e,t,n,r){var o=3>arguments.length,t=p(t,r);return s(e,function(e,r,s){n=o?(o=i,e):t(n,e,r,s)}),n}function D(e,t,n,r){var o=e?e.length:0,u=3>arguments.length;if(o!==+o)var a=Lt(e),o=a.length;return s(e,function(s,f,l){f=a?a[--o]:--o,n=u?(u=i,e[f]):t.call(r,n,e[f],f,l)}),n}function P(e,t,n){var r,t=p(t,n);return s(e,function(e,n,i){return(r=t(e,n,i))&&xt}),!!r -}function H(e,t,n){if(e)return t==r||n?e[0]:st.call(e,0,t)}function B(e,t){for(var n=-1,r=e?e.length:0,i=[];++nn?ct(0,i+n):n||0)-1;else if(n)return r=I(e,t),e[r]===t?r:-1;for(;++r>>1,n(e[r])>>1,e[r]j(a,r))a.push(r),u.push(e[s]);return u}function R(e,t){return St||ut&&2n||e===t)return 1;if(er&&(r=n,u=e)});else for(;++iu&&(u=e[i]);return u}function M(e,t){var n=[];return s(e,function(e){n.push(e[t])}),n}function _(e,t,n,r){var o=3>arguments.length,t=p(t,r);return s(e,function(e,r,s){n=o?(o=i,e):t(n,e,r,s)}),n}function D(e,t,n,r){var o=e?e.length:0,u=3>arguments.length;if(o!==+o)var a=At(e),o=a.length;return s(e,function(s,f,l){f=a?a[--o]:--o,n=u?(u=i,e[f]):t.call(r,n,e[f],f,l)}),n}function P(e,t,n){var r,t=p(t,n);return s(e,function(e,n,i){return(r=t(e,n,i))&&Tt}),!!r +}function H(e,t,n){if(e)return t==r||n?e[0]:st.call(e,0,t)}function B(e,t){for(var n=-1,r=e?e.length:0,i=[];++nn?ht(0,i+n):n||0)-1;else if(n)return r=I(e,t),e[r]===t?r:-1;for(;++r>>1,n(e[r])>>1,e[r]j(a,r))a.push(r),u.push(e[s]);return u}function R(e,t){return xt||ut&&2"']/g,Z=/['\n\r\t\u2028\u2029\\]/g,et=Math.ceil,tt=X.concat,nt=Math.floor,rt=V.hasOwnProperty,it=X.push,st=X.slice,ot=V.toString,ut=Q.test(ut=st.bind)&&ut,at=Q. -test(at=Array.isArray)&&at,ft=e.isFinite,lt=Q.test(lt=Object.keys)&<,ct=Math.max,ht=Math.min,pt=Math.random,dt="[object Array]",vt="[object Boolean]",mt="[object Date]",gt="[object Number]",yt="[object Object]",bt="[object RegExp]",wt="[object String]",Et=(Et={0:1,length:1},X.splice.call(Et,0,1),Et[0]),St=ut&&/\n|Opera/.test(ut+ot.call(e.opera)),xt={"boolean":i,"function":n,object:n,number:i,string:i,"undefined":i},Tt={"\\":"\\","'":"'","\n":"n","\r":"r"," ":"t","\u2028":"u2028","\u2029":"u2029" -};l.templateSettings={escape:/<%-([\s\S]+?)%>/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},l.isArguments=function(e){return"[object Arguments]"==ot.call(e)},l.isArguments(arguments)||(l.isArguments=function(e){return e?rt.call(e,"callee"):i});var Nt=at||function(e){return ot.call(e)==dt};y(/x/)&&(y=function(e){return"[object Function]"==ot.call(e)});var Ct={"&":"&","<":"<",">":">",'"':""","'":"'"},kt=E(Ct),Lt=lt?function(e){return e&&xt[typeof e]?lt -(e):[]}:b;l.VERSION="0.8.2",l.after=function(e,t){return 1>e?t():function(){if(1>--e)return t.apply(this,arguments)}},l.bind=R,l.bindAll=function(e){var t,n,r=e;if(!e)return r;var i=arguments;t=1j(r,s,n)&&i.push(s)}return i},l.escape=function(e){return e==r?"":(e+"").replace(Y,v)},l.every=C,l.extend=o,l.filter=k,l.find=L,l.first=H,l.flatten=B,l.forEach=s,l.functions=w,l.groupBy=function(e,t,n){var r={},t=p(t,n);return s(e,function(e,n -,i){n=t(e,n,i),(rt.call(r,n)?r[n]:r[n]=[]).push(e)}),r},l.has=function(e,t){return e?rt.call(e,t):i},l.identity=U,l.indexOf=j,l.initial=function(e,t,n){return e?st.call(e,0,-(t==r||n?1:t)):[]},l.intersection=function(e){var t=arguments.length,n=-1,r=e.length,i=[];e:for(;++nj(i,s)){for(var o=1;oj(arguments[o],s))continue e;i.push(s)}}return i},l.invert=E,l.invoke=function(e,t){var n=st.call(arguments,2),r="function"==typeof t,i=[];return s(e,function(e){i.push((r?t -:e[t]).apply(e,n))}),i},l.isArray=Nt,l.isBoolean=function(e){return e===n||e===i||ot.call(e)==vt},l.isDate=function(e){return ot.call(e)==mt},l.isElement=function(e){return e?1===e.nodeType:i},l.isEmpty=function(e){if(!e)return n;if(Nt(e)||x(e))return!e.length;for(var t in e)if(rt.call(e,t))return i;return n},l.isEqual=S,l.isFinite=function(e){return ft(e)&&ot.call(e)==gt},l.isFunction=y,l.isNaN=function(e){return ot.call(e)==gt&&e!=+e},l.isNull=function(e){return e===r},l.isNumber=function(e){return ot -.call(e)==gt},l.isObject=function(e){return e?xt[typeof e]:i},l.isRegExp=function(e){return ot.call(e)==bt},l.isString=x,l.isUndefined=function(e){return e===t},l.keys=Lt,l.last=function(e,t,n){if(e){var i=e.length;return t==r||n?e[i-1]:st.call(e,-t||i)}},l.lastIndexOf=function(e,t,n){var r=e?e.length:0;for("number"==typeof n&&(r=(0>n?ct(0,r+n):ht(n,r-1))+1);r--;)if(e[r]===t)return r;return-1},l.map=A,l.max=O,l.memoize=function(e,t){var n={};return function(){var r=t?t.apply(this,arguments):arguments -[0];return rt.call(n,r)?n[r]:n[r]=e.apply(this,arguments)}},l.min=function(e,t,n){var r=Infinity,i=-1,o=e?e.length:0,u=r;if(t||o!==+o)t=p(t,n),s(e,function(e,n,i){n=t(e,n,i),nj(t,r,1)&&(n[r]=e)}),n}, -l.once=function(e){var t,s=i;return function(){return s?t:(s=n,t=e.apply(this,arguments),e=r,t)}},l.pairs=function(e){var t=[];return a(e,function(e,n){t.push([n,e])}),t},l.pick=function(e){for(var t=0,n=tt.apply(X,arguments),r=n.length,i={};++t=f?(clearTimeout(u),a=r,s=e.apply(o,i)):u||(u=setTimeout(n,f)),s}},l.times=function(e,t,n){for(var e=+e||0,r=-1,i=Array( -e);++rj(r,i)&&r.push(i)}return r},l.uniq=q,l.uniqueId=function(e){var t=$++;return e?e+t:t},l.values=T,l.where=function(e,t){var n=[];f(t,function(e,t){n.push(t)});var r=n.length,i=[];return s(e,function(e){for( -var s=-1;++sj(arguments,i,1)&&r.push(i)}return r},l.wrap=function(e,t){return function(){var n=[e];return arguments.length&&it.apply(n,arguments),t.apply(this,n)}},l.zip=function(e){for(var t=-1,n=e?O(M(arguments,"length")):0,r=Array(n);++t/g,evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,variable:""},l.isArguments=function(e){return"[object Arguments]"==ot.call(e)},l.isArguments(arguments)||(l.isArguments=function(e){return e?rt.call(e,"callee"):i});var Ct=at||function(e){return ot.call(e)==vt};y(/x/)&&(y=function(e){return"[object Function]"==ot.call(e)});var kt={"&":"&","<":"<",">":">",'"':""","'":"'"},Lt=E(kt),At=ct?function(e){return e&&Tt[typeof +e]?ct(e):[]}:b;l.VERSION="0.8.2",l.after=function(e,t){return 1>e?t():function(){if(1>--e)return t.apply(this,arguments)}},l.bind=R,l.bindAll=function(e){var t,n,r=e;if(!e)return r;var i=arguments;t=1j(r,s,n)&&i.push(s)}return i},l.escape=function(e){return e==r?"":(e+"").replace(Y,v)},l.every=C,l.extend=o,l.filter=k,l.find=L,l.first=H,l.flatten=B,l.forEach=s,l.functions=w,l.groupBy=function(e,t,n){var r={},t=p(t,n);return s(e,function(e +,n,i){n=t(e,n,i),(rt.call(r,n)?r[n]:r[n]=[]).push(e)}),r},l.has=function(e,t){return e?rt.call(e,t):i},l.identity=U,l.indexOf=j,l.initial=function(e,t,n){return e?st.call(e,0,-(t==r||n?1:t)):[]},l.intersection=function(e){var t=arguments.length,n=-1,r=e.length,i=[];e:for(;++nj(i,s)){for(var o=1;oj(arguments[o],s))continue e;i.push(s)}}return i},l.invert=E,l.invoke=function(e,t){var n=st.call(arguments,2),r="function"==typeof t,i=[];return s(e,function(e){i.push((r? +t:e[t]).apply(e,n))}),i},l.isArray=Ct,l.isBoolean=function(e){return e===n||e===i||ot.call(e)==mt},l.isDate=function(e){return ot.call(e)==gt},l.isElement=function(e){return e?1===e.nodeType:i},l.isEmpty=function(e){if(!e)return n;if(Ct(e)||x(e))return!e.length;for(var t in e)if(rt.call(e,t))return i;return n},l.isEqual=S,l.isFinite=function(e){return ft(e)&&!lt(parseFloat(e))},l.isFunction=y,l.isNaN=function(e){return ot.call(e)==yt&&e!=+e},l.isNull=function(e){return e===r},l.isNumber=function( +e){return ot.call(e)==yt},l.isObject=function(e){return e?Tt[typeof e]:i},l.isRegExp=function(e){return ot.call(e)==wt},l.isString=x,l.isUndefined=function(e){return e===t},l.keys=At,l.last=function(e,t,n){if(e){var i=e.length;return t==r||n?e[i-1]:st.call(e,-t||i)}},l.lastIndexOf=function(e,t,n){var r=e?e.length:0;for("number"==typeof n&&(r=(0>n?ht(0,r+n):pt(n,r-1))+1);r--;)if(e[r]===t)return r;return-1},l.map=A,l.max=O,l.memoize=function(e,t){var n={};return function(){var r=t?t.apply(this,arguments +):arguments[0];return rt.call(n,r)?n[r]:n[r]=e.apply(this,arguments)}},l.min=function(e,t,n){var r=Infinity,i=-1,o=e?e.length:0,u=r;if(t||o!==+o)t=p(t,n),s(e,function(e,n,i){n=t(e,n,i),nj(t,r,1)&&(n[ +r]=e)}),n},l.once=function(e){var t,s=i;return function(){return s?t:(s=n,t=e.apply(this,arguments),e=r,t)}},l.pairs=function(e){var t=[];return a(e,function(e,n){t.push([n,e])}),t},l.pick=function(e){for(var t=0,n=tt.apply(X,arguments),r=n.length,i={};++t=f?(clearTimeout(u),a=r,s=e.apply(o,i)):u||(u=setTimeout(n,f)),s}},l.times=function(e,t,n){for(var e=+e||0,r=-1 +,i=Array(e);++rj(r,i)&&r.push(i)}return r},l.uniq=q,l.uniqueId=function(e){var t=$++;return e?e+t:t},l.values=T,l.where=function(e,t){var n=[];f(t,function(e,t){n.push(t)});var r=n.length,i=[];return s(e,function( +e){for(var s=-1;++sj(arguments,i,1)&&r.push(i)}return r},l.wrap=function(e,t){return function(){var n=[e];return arguments.length&&it.apply(n,arguments),t.apply(this,n)}},l.zip=function(e){for(var t=-1,n=e?O(M(arguments,"length")):0,r=Array(n);++t2;e==null&&(e=[]);if(d&&e.reduce===d)return r&&(t=T.bind(t,r)),i?e.reduce(t,n):e.reduce(t);N(e,function(e,s,o){i?n=t.call(r,n,e,s,o):(n=e,i=!0)});if(!i)throw new TypeError("Reduce of empty array with no initial value");return n},T.reduceRight=T.foldr=function(e,t,n,r){var i=arguments.length>2;e==null&&(e=[]);if(v&&e.reduceRight===v)return r&&(t=T.bind(t,r)),arguments.length>2?e.reduceRight(t,n):e.reduceRight(t);var s=e.length;if(s!==+s){var o=T.keys(e);s=o.length}N(e,function(u,a,f){a=o?o[--s]:--s,i?n=t.call(r,n,e[a],a,f):(n=e[a],i=!0)});if(!i)throw new TypeError("Reduce of empty array with no initial value");return n},T.find=T.detect=function(e,t,n){var r;return C(e,function(e,i,s){if(t.call(n,e,i,s))return r=e,!0}),r},T.filter=T.select=function(e,t,n){var r=[];return e==null?r:m&&e.filter===m?e.filter(t,n):(N(e,function(e,i,s){t.call(n,e,i,s)&&(r[r.length]=e)}),r)},T.reject=function(e,t,n){return T.filter(e,function(e,r,i){return!t.call(n,e,r,i)},n)},T.every=T.all=function(e,t,r){t||(t=T.identity);var i=!0;return e==null?i:g&&e.every===g?e.every(t,r):(N(e,function(e,s,o){if(!(i=i&&t.call(r,e,s,o)))return n}),!!i)};var C=T.some=T.any=function(e,t,r){t||(t=T.identity);var i=!1;return e==null?i:y&&e.some===y?e.some(t,r):(N(e,function(e,s,o){if(i||(i=t.call(r,e,s,o)))return n}),!!i)};T.contains=T.include=function(e,t){var n=!1;return e==null?n:b&&e.indexOf===b?e.indexOf(t)!=-1:(n=C(e,function(e){return e===t}),n)},T.invoke=function(e,t){var n=u.call(arguments,2);return T.map(e,function(e){return(T.isFunction(t)?t:e[t]).apply(e,n)})},T.pluck=function(e,t){return T.map(e,function(e){return e[t]})},T.where=function(e,t){return T.isEmpty(t)?[]:T.filter(e,function(e){for(var n in t)if(t[n]!==e[n])return!1;return!0})},T.max=function(e,t,n){if(!t&&T.isArray(e)&&e[0]===+e[0]&&e.length<65535)return Math.max.apply(Math,e);if(!t&&T.isEmpty(e))return-Infinity;var r={computed:-Infinity};return N(e,function(e,i,s){var o=t?t.call(n,e,i,s):e;o>=r.computed&&(r={value:e,computed:o})}),r.value},T.min=function(e,t,n){if(!t&&T.isArray(e)&&e[0]===+e[0]&&e.length<65535)return Math.min.apply(Math,e);if(!t&&T.isEmpty(e))return Infinity;var r={computed:Infinity};return N(e,function(e,i,s){var o=t?t.call(n,e,i,s):e;or||n===void 0)return 1;if(n>>1;n.call(r,e[u])=0})})},T.difference=function(e){var t=a.apply(r,u.call(arguments,1));return T.filter(e,function(e){return!T.contains(t,e)})},T.zip=function(){var e=u.call(arguments),t=T.max(T.pluck(e,"length")),n=new Array(t);for(var r=0;r=0;n--)t=[e[n].apply(this,t)];return t[0]}},T.after=function(e,t){return e<=0?t():function(){if(--e<1)return t.apply(this,arguments)}},T.keys=S||function(e){if(e!==Object(e))throw new TypeError("Invalid object");var t=[];for(var n in e)T.has(e,n)&&(t[t.length]=n);return t},T.values=function(e){var t=[];for(var n in e)T.has(e,n)&&t.push(e[n]);return t},T.pairs=function(e){var t=[];for(var n in e)T.has(e,n)&&t.push([n,e[n]]);return t},T.invert=function(e){var t={};for(var n in e)T.has(e,n)&&(t[e[n]]=n);return t},T.functions=T.methods=function(e){var t=[];for(var n in e)T.isFunction(e[n])&&t.push(n);return t.sort()},T.extend=function(e){return N(u.call(arguments,1),function(t){for(var n in t)e[n]=t[n]}),e},T.pick=function(e){var t={},n=a.apply(r,u.call(arguments,1));return N(n,function(n){n in e&&(t[n]=e[n])}),t},T.omit=function(e){var t={},n=a.apply(r,u.call(arguments,1));for(var i in e)T.contains(n,i)||(t[i]=e[i]);return t},T.defaults=function(e){return N(u.call(arguments,1),function(t){for(var n in t)e[n]==null&&(e[n]=t[n])}),e},T.clone=function(e){return T.isObject(e)?T.isArray(e)?e.slice():T.extend({},e):e},T.tap=function(e,t){return t(e),e};var M=function(e,t,n,r){if(e===t)return e!==0||1/e==1/t;if(e==null||t==null)return e===t;e instanceof T&&(e=e._wrapped),t instanceof T&&(t=t._wrapped);var i=l.call(e);if(i!=l.call(t))return!1;switch(i){case"[object String]":return e==String(t);case"[object Number]":return e!=+e?t!=+t:e==0?1/e==1/t:e==+t;case"[object Date]":case"[object Boolean]":return+e==+t;case"[object RegExp]":return e.source==t.source&&e.global==t.global&&e.multiline==t.multiline&&e.ignoreCase==t.ignoreCase}if(typeof e!="object"||typeof t!="object")return!1;var s=n.length;while(s--)if(n[s]==e)return r[s]==t;n.push(e),r.push(t);var o=0,u=!0;if(i=="[object Array]"){o=e.length,u=o==t.length;if(u)while(o--)if(!(u=M(e[o],t[o],n,r)))break}else{var a=e.constructor,f=t.constructor;if(a!==f&&!(T.isFunction(a)&&a instanceof a&&T.isFunction(f)&&f instanceof f))return!1;for(var c in e)if(T.has(e,c)){o++;if(!(u=T.has(t,c)&&M(e[c],t[c],n,r)))break}if(u){for(c in t)if(T.has(t,c)&&!(o--))break;u=!o}}return n.pop(),r.pop(),u};T.isEqual=function(e,t){return M(e,t,[],[])},T.isEmpty=function(e){if(e==null)return!0;if(T.isArray(e)||T.isString(e))return e.length===0;for(var t in e)if(T.has(e,t))return!1;return!0},T.isElement=function(e){return!!e&&e.nodeType===1},T.isArray=E||function(e){return l.call(e)=="[object Array]"},T.isObject=function(e){return e===Object(e)},N(["Arguments","Function","String","Number","Date","RegExp"],function(e){T["is"+e]=function(t){return l.call(t)=="[object "+e+"]"}}),T.isArguments(arguments)||(T.isArguments=function(e){return!!e&&!!T.has(e,"callee")}),typeof /./!="function"&&(T.isFunction=function(e){return typeof e=="function"}),T.isFinite=function(e){return T.isNumber(e)&&isFinite(e)},T.isNaN=function(e){return T.isNumber(e)&&e!=+e},T.isBoolean=function(e){return e===!0||e===!1||l.call(e)=="[object Boolean]"},T.isNull=function(e){return e===null},T.isUndefined=function(e){return e===void 0},T.has=function(e,t){return c.call(e,t)},T.noConflict=function(){return e._=t,this},T.identity=function(e){return e},T.times=function(e,t,n){for(var r=0;r":">",'"':""","'":"'","/":"/"}};_.unescape=T.invert(_.escape);var D={escape:new RegExp("["+T.keys(_.escape).join("")+"]","g"),unescape:new RegExp("("+T.keys(_.unescape).join("|")+")","g")};T.each(["escape","unescape"],function(e){T[e]=function(t){return t==null?"":(""+t).replace(D[e],function(t){return _[e][t]})}}),T.result=function(e,t){if(e==null)return null;var n=e[t];return T.isFunction(n)?n.call(e):n},T.mixin=function(e){N(T.functions(e),function(t){var n=T[t]=e[t];T.prototype[t]=function(){var e=[this._wrapped];return o.apply(e,arguments),F.call(this,n.apply(T,e))}})};var P=0;T.uniqueId=function(e){var t=P++;return e?e+t:t},T.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var H=/(.)^/,B={"'":"'","\\":"\\","\r":"r","\n":"n"," ":"t","\u2028":"u2028","\u2029":"u2029"},j=/\\|'|\r|\n|\t|\u2028|\u2029/g;T.template=function(e,t,n){n=T.defaults({},n,T.templateSettings);var r=new RegExp([(n.escape||H).source,(n.interpolate||H).source,(n.evaluate||H).source].join("|")+"|$","g"),i=0,s="__p+='";e.replace(r,function(t,n,r,o,u){s+=e.slice(i,u).replace(j,function(e){return"\\"+B[e]}),s+=n?"'+\n((__t=("+n+"))==null?'':_.escape(__t))+\n'":r?"'+\n((__t=("+r+"))==null?'':__t)+\n'":o?"';\n"+o+"\n__p+='":"",i=u+t.length}),s+="';\n",n.variable||(s="with(obj||{}){\n"+s+"}\n"),s="var __t,__p='',__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,'');};\n"+s+"return __p;\n";try{var o=new Function(n.variable||"obj","_",s)}catch(u){throw u.source=s,u}if(t)return o(t,T);var a=function(e){return o.call(this,e,T)};return a.source="function("+(n.variable||"obj")+"){\n"+s+"}",a},T.chain=function(e){return T(e).chain()};var F=function(e){return this._chain?T(e).chain():e};T.mixin(T),N(["pop","push","reverse","shift","sort","splice","unshift"],function(e){var t=r[e];T.prototype[e]=function(){var n=this._wrapped;return t.apply(n,arguments),(e=="shift"||e=="splice")&&n.length===0&&delete n[0],F.call(this,n)}}),N(["concat","join","slice"],function(e){var t=r[e];T.prototype[e]=function(){return F.call(this,t.apply(this._wrapped,arguments))}}),T.extend(T.prototype,{chain:function(){return this._chain=!0,this},value:function(){return this._wrapped}})}).call(this); \ No newline at end of file +(function(){var e=this,t=e._,n={},r=Array.prototype,i=Object.prototype,s=Function.prototype,o=r.push,u=r.slice,a=r.concat,f=r.unshift,l=i.toString,c=i.hasOwnProperty,h=r.forEach,p=r.map,d=r.reduce,v=r.reduceRight,m=r.filter,g=r.every,y=r.some,b=r.indexOf,w=r.lastIndexOf,E=Array.isArray,S=Object.keys,x=s.bind,T=function(e){if(e instanceof T)return e;if(!(this instanceof T))return new T(e);this._wrapped=e};typeof exports!="undefined"?(typeof module!="undefined"&&module.exports&&(exports=module.exports=T),exports._=T):e._=T,T.VERSION="1.4.2";var N=T.each=T.forEach=function(e,t,r){if(e==null)return;if(h&&e.forEach===h)e.forEach(t,r);else if(e.length===+e.length){for(var i=0,s=e.length;i2;e==null&&(e=[]);if(d&&e.reduce===d)return r&&(t=T.bind(t,r)),i?e.reduce(t,n):e.reduce(t);N(e,function(e,s,o){i?n=t.call(r,n,e,s,o):(n=e,i=!0)});if(!i)throw new TypeError("Reduce of empty array with no initial value");return n},T.reduceRight=T.foldr=function(e,t,n,r){var i=arguments.length>2;e==null&&(e=[]);if(v&&e.reduceRight===v)return r&&(t=T.bind(t,r)),arguments.length>2?e.reduceRight(t,n):e.reduceRight(t);var s=e.length;if(s!==+s){var o=T.keys(e);s=o.length}N(e,function(u,a,f){a=o?o[--s]:--s,i?n=t.call(r,n,e[a],a,f):(n=e[a],i=!0)});if(!i)throw new TypeError("Reduce of empty array with no initial value");return n},T.find=T.detect=function(e,t,n){var r;return C(e,function(e,i,s){if(t.call(n,e,i,s))return r=e,!0}),r},T.filter=T.select=function(e,t,n){var r=[];return e==null?r:m&&e.filter===m?e.filter(t,n):(N(e,function(e,i,s){t.call(n,e,i,s)&&(r[r.length]=e)}),r)},T.reject=function(e,t,n){return T.filter(e,function(e,r,i){return!t.call(n,e,r,i)},n)},T.every=T.all=function(e,t,r){t||(t=T.identity);var i=!0;return e==null?i:g&&e.every===g?e.every(t,r):(N(e,function(e,s,o){if(!(i=i&&t.call(r,e,s,o)))return n}),!!i)};var C=T.some=T.any=function(e,t,r){t||(t=T.identity);var i=!1;return e==null?i:y&&e.some===y?e.some(t,r):(N(e,function(e,s,o){if(i||(i=t.call(r,e,s,o)))return n}),!!i)};T.contains=T.include=function(e,t){var n=!1;return e==null?n:b&&e.indexOf===b?e.indexOf(t)!=-1:(n=C(e,function(e){return e===t}),n)},T.invoke=function(e,t){var n=u.call(arguments,2);return T.map(e,function(e){return(T.isFunction(t)?t:e[t]).apply(e,n)})},T.pluck=function(e,t){return T.map(e,function(e){return e[t]})},T.where=function(e,t){return T.isEmpty(t)?[]:T.filter(e,function(e){for(var n in t)if(t[n]!==e[n])return!1;return!0})},T.max=function(e,t,n){if(!t&&T.isArray(e)&&e[0]===+e[0]&&e.length<65535)return Math.max.apply(Math,e);if(!t&&T.isEmpty(e))return-Infinity;var r={computed:-Infinity};return N(e,function(e,i,s){var o=t?t.call(n,e,i,s):e;o>=r.computed&&(r={value:e,computed:o})}),r.value},T.min=function(e,t,n){if(!t&&T.isArray(e)&&e[0]===+e[0]&&e.length<65535)return Math.min.apply(Math,e);if(!t&&T.isEmpty(e))return Infinity;var r={computed:Infinity};return N(e,function(e,i,s){var o=t?t.call(n,e,i,s):e;or||n===void 0)return 1;if(n>>1;n.call(r,e[u])=0})})},T.difference=function(e){var t=a.apply(r,u.call(arguments,1));return T.filter(e,function(e){return!T.contains(t,e)})},T.zip=function(){var e=u.call(arguments),t=T.max(T.pluck(e,"length")),n=new Array(t);for(var r=0;r=0;n--)t=[e[n].apply(this,t)];return t[0]}},T.after=function(e,t){return e<=0?t():function(){if(--e<1)return t.apply(this,arguments)}},T.keys=S||function(e){if(e!==Object(e))throw new TypeError("Invalid object");var t=[];for(var n in e)T.has(e,n)&&(t[t.length]=n);return t},T.values=function(e){var t=[];for(var n in e)T.has(e,n)&&t.push(e[n]);return t},T.pairs=function(e){var t=[];for(var n in e)T.has(e,n)&&t.push([n,e[n]]);return t},T.invert=function(e){var t={};for(var n in e)T.has(e,n)&&(t[e[n]]=n);return t},T.functions=T.methods=function(e){var t=[];for(var n in e)T.isFunction(e[n])&&t.push(n);return t.sort()},T.extend=function(e){return N(u.call(arguments,1),function(t){for(var n in t)e[n]=t[n]}),e},T.pick=function(e){var t={},n=a.apply(r,u.call(arguments,1));return N(n,function(n){n in e&&(t[n]=e[n])}),t},T.omit=function(e){var t={},n=a.apply(r,u.call(arguments,1));for(var i in e)T.contains(n,i)||(t[i]=e[i]);return t},T.defaults=function(e){return N(u.call(arguments,1),function(t){for(var n in t)e[n]==null&&(e[n]=t[n])}),e},T.clone=function(e){return T.isObject(e)?T.isArray(e)?e.slice():T.extend({},e):e},T.tap=function(e,t){return t(e),e};var M=function(e,t,n,r){if(e===t)return e!==0||1/e==1/t;if(e==null||t==null)return e===t;e instanceof T&&(e=e._wrapped),t instanceof T&&(t=t._wrapped);var i=l.call(e);if(i!=l.call(t))return!1;switch(i){case"[object String]":return e==String(t);case"[object Number]":return e!=+e?t!=+t:e==0?1/e==1/t:e==+t;case"[object Date]":case"[object Boolean]":return+e==+t;case"[object RegExp]":return e.source==t.source&&e.global==t.global&&e.multiline==t.multiline&&e.ignoreCase==t.ignoreCase}if(typeof e!="object"||typeof t!="object")return!1;var s=n.length;while(s--)if(n[s]==e)return r[s]==t;n.push(e),r.push(t);var o=0,u=!0;if(i=="[object Array]"){o=e.length,u=o==t.length;if(u)while(o--)if(!(u=M(e[o],t[o],n,r)))break}else{var a=e.constructor,f=t.constructor;if(a!==f&&!(T.isFunction(a)&&a instanceof a&&T.isFunction(f)&&f instanceof f))return!1;for(var c in e)if(T.has(e,c)){o++;if(!(u=T.has(t,c)&&M(e[c],t[c],n,r)))break}if(u){for(c in t)if(T.has(t,c)&&!(o--))break;u=!o}}return n.pop(),r.pop(),u};T.isEqual=function(e,t){return M(e,t,[],[])},T.isEmpty=function(e){if(e==null)return!0;if(T.isArray(e)||T.isString(e))return e.length===0;for(var t in e)if(T.has(e,t))return!1;return!0},T.isElement=function(e){return!!e&&e.nodeType===1},T.isArray=E||function(e){return l.call(e)=="[object Array]"},T.isObject=function(e){return e===Object(e)},N(["Arguments","Function","String","Number","Date","RegExp"],function(e){T["is"+e]=function(t){return l.call(t)=="[object "+e+"]"}}),T.isArguments(arguments)||(T.isArguments=function(e){return!!e&&!!T.has(e,"callee")}),typeof /./!="function"&&(T.isFunction=function(e){return typeof e=="function"}),T.isFinite=function(e){return isFinite(e)&&!isNaN(parseFloat(e))},T.isNaN=function(e){return T.isNumber(e)&&e!=+e},T.isBoolean=function(e){return e===!0||e===!1||l.call(e)=="[object Boolean]"},T.isNull=function(e){return e===null},T.isUndefined=function(e){return e===void 0},T.has=function(e,t){return c.call(e,t)},T.noConflict=function(){return e._=t,this},T.identity=function(e){return e},T.times=function(e,t,n){for(var r=0;r":">",'"':""","'":"'","/":"/"}};_.unescape=T.invert(_.escape);var D={escape:new RegExp("["+T.keys(_.escape).join("")+"]","g"),unescape:new RegExp("("+T.keys(_.unescape).join("|")+")","g")};T.each(["escape","unescape"],function(e){T[e]=function(t){return t==null?"":(""+t).replace(D[e],function(t){return _[e][t]})}}),T.result=function(e,t){if(e==null)return null;var n=e[t];return T.isFunction(n)?n.call(e):n},T.mixin=function(e){N(T.functions(e),function(t){var n=T[t]=e[t];T.prototype[t]=function(){var e=[this._wrapped];return o.apply(e,arguments),F.call(this,n.apply(T,e))}})};var P=0;T.uniqueId=function(e){var t=P++;return e?e+t:t},T.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var H=/(.)^/,B={"'":"'","\\":"\\","\r":"r","\n":"n"," ":"t","\u2028":"u2028","\u2029":"u2029"},j=/\\|'|\r|\n|\t|\u2028|\u2029/g;T.template=function(e,t,n){n=T.defaults({},n,T.templateSettings);var r=new RegExp([(n.escape||H).source,(n.interpolate||H).source,(n.evaluate||H).source].join("|")+"|$","g"),i=0,s="__p+='";e.replace(r,function(t,n,r,o,u){s+=e.slice(i,u).replace(j,function(e){return"\\"+B[e]}),s+=n?"'+\n((__t=("+n+"))==null?'':_.escape(__t))+\n'":r?"'+\n((__t=("+r+"))==null?'':__t)+\n'":o?"';\n"+o+"\n__p+='":"",i=u+t.length}),s+="';\n",n.variable||(s="with(obj||{}){\n"+s+"}\n"),s="var __t,__p='',__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,'');};\n"+s+"return __p;\n";try{var o=new Function(n.variable||"obj","_",s)}catch(u){throw u.source=s,u}if(t)return o(t,T);var a=function(e){return o.call(this,e,T)};return a.source="function("+(n.variable||"obj")+"){\n"+s+"}",a},T.chain=function(e){return T(e).chain()};var F=function(e){return this._chain?T(e).chain():e};T.mixin(T),N(["pop","push","reverse","shift","sort","splice","unshift"],function(e){var t=r[e];T.prototype[e]=function(){var n=this._wrapped;return t.apply(n,arguments),(e=="shift"||e=="splice")&&n.length===0&&delete n[0],F.call(this,n)}}),N(["concat","join","slice"],function(e){var t=r[e];T.prototype[e]=function(){return F.call(this,t.apply(this._wrapped,arguments))}}),T.extend(T.prototype,{chain:function(){return this._chain=!0,this},value:function(){return this._wrapped}})}).call(this); \ No newline at end of file diff --git a/vendor/underscore/underscore.js b/vendor/underscore/underscore.js index 65b59c0cd..db899df47 100644 --- a/vendor/underscore/underscore.js +++ b/vendor/underscore/underscore.js @@ -951,7 +951,7 @@ // Is a given object a finite number? _.isFinite = function(obj) { - return _.isNumber(obj) && isFinite(obj); + return isFinite( obj ) && !isNaN( parseFloat(obj) ); }; // Is the given value `NaN`? (NaN is the only number which does not equal itself).