Refs #7290 Fix tests and JSlint

1 files changed, 2 insertions, 2 deletions

diff --git a/piwik.js b/piwik.js
index 836b81b4f8..7dee2eeab8 100644
--- a/piwik.js
+++ b/piwik.js
@@ -30,8 +30,8 @@ if(Q.hasNodeAttributeWithValue(W,"href")){X=Q.getAttributeValueFromNode(W,"href"
 G.name=W+"###"+ac+"###"+X}var ab=G.name.split("###");return ab.length===3&&ab[0]===W}function M(X,ac,Z){var ab=G.name.split("###"),aa=ab[1],W=ab[2],Y=B(X,ac);i(Y+"plugins/Overlay/client/client.js?v=1",function(){Piwik_Overlay_Client.initialize(Y,Z,aa,W)})}function D(aE,bm){var ad=N(u.domain,G.location.href,x()),bM=y(ad[0]),b4=F(ad[1]),bu=F(ad[2]),b8=false,bq="GET",bs=bq,bc="application/x-www-form-urlencoded; charset=UTF-8",aK=bc,aa=aE||"",ax="",bo="",bS=bm||"",aJ="",a2="",a7,aS=u.title,aU="7z|aac|apk|ar[cj]|as[fx]|avi|azw3|bin|csv|deb|dmg|docx?|epub|exe|flv|gif|gz|gzip|hqx|jar|jpe?g|js|mobi|mp(2|3|4|e?g)|mov(ie)?|ms[ip]|od[bfgpst]|og[gv]|pdf|phps|png|pptx?|qtm?|ra[mr]?|rpm|sea|sit|tar|t?bz2?|tgz|torrent|txt|wav|wm[av]|wpd||xlsx?|xml|z|zip",bp=[bM],ai=[],bf=[],aC=[],bn=500,aj,aG,ak,an,aY=["pk_campaign","piwik_campaign","utm_campaign","utm_source","utm_medium"],aP=["pk_kwd","piwik_kwd","utm_term"],b2="_pk_",aq,b3,ao=false,bW,a0,a5,aw=33955200000,az=1800000,ba=15768000000,a1=true,aI=0,a6=false,ag=false,au,bg={},ab={},bX=200,bF={},bT={},ah=[],ay=false,a9=false,bz=false,bU=false,bw=false,bt,bj,at,aX=T,by;
 function bH(ch,ce,cd,cg,cc,cf){if(ao){return}var cb;if(cd){cb=new Date();cb.setTime(cb.getTime()+cd)}u.cookie=ch+"="+l(ce)+(cd?";expires="+cb.toGMTString():"")+";path="+(cg||"/")+(cc?";domain="+cc:"")+(cf?";secure":"")}function av(cd){if(ao){return 0}var cb=new RegExp("(^|;)[ ]*"+cd+"=([^;]*)"),cc=cb.exec(u.cookie);return cc?F(cc[2]):0}function bY(cb){var cc;if(ak){cc=new RegExp("#.*");return cb.replace(cc,"")}return cb}function bL(cd,cb){var ce=k(cb),cc;if(ce){return cb}if(cb.slice(0,1)==="/"){return k(cd)+"://"+b(cd)+cb}cd=bY(cd);cc=cd.indexOf("?");if(cc>=0){cd=cd.slice(0,cc)}cc=cd.lastIndexOf("/");if(cc!==cd.length-1){cd=cd.slice(0,cc+1)}return cd+cb}function br(ce){var cc,cb,cd;for(cc=0;cc<bp.length;cc++){cb=y(bp[cc].toLowerCase());if(ce===cb){return true}if(cb.slice(0,1)==="."){if(ce===cb.slice(1)){return true}cd=ce.length-cb.length;if((cd>0)&&(ce.slice(cd)===cb)){return true}}}return false}function ca(cb,cd){var cc=new Image(1,1);cc.onload=function(){t=0;if(typeof cd==="function"){cd()
 }};cc.src=aa+(aa.indexOf("?")<0?"?":"&")+cb}function bI(cc,cf,cb){if(!w(cb)||null===cb){cb=true}try{var ce=G.XMLHttpRequest?new G.XMLHttpRequest():G.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;ce.open("POST",aa,true);ce.onreadystatechange=function(){if(this.readyState===4&&!(this.status>=200&&this.status<300)&&cb){ca(cc,cf)}else{if(typeof cf==="function"){cf()}}};ce.setRequestHeader("Content-Type",aK);ce.send(cc)}catch(cd){if(cb){ca(cc,cf)}}}function bZ(cc){var cb=new Date();var cd=cb.getTime()+cc;if(!j||cd>j){j=cd}}function aD(cf){var cc=new Date();var cb=cc.getTime();if(a9&&cb<a9){var cd=a9-cb;setTimeout(cf,cd);bZ(cd+50);a9+=50;return}if(a9===false){var ce=800;a9=cb+ce}cf()}function aZ(cc,cb,cd){if(!bW&&cc){aD(function(){if(bs==="POST"){bI(cc,cd)}else{ca(cc,cd)}bZ(cb)})}}function bb(cb){if(bW){return false}return(cb&&cb.length)}function ap(cd,cb){if(!bb(cd)){return}var cc='{"requests":["?'+cd.join('","?')+'"]}';aD(function(){bI(cc,null,false);bZ(cb)})}function bG(cb){return b2+cb+"."+bS+"."+by
-}function ae(){if(ao){return"0"}if(!w(e.cookieEnabled)){var cb=bG("testcookie");bH(cb,"1");return av(cb)==="1"?"1":"0"}return e.cookieEnabled?"1":"0"}function bk(){by=aX((aq||bM)+(b3||"/")).slice(0,4)}function ar(){var cc=bG("cvar"),cb=av(cc);if(cb.length){cb=JSON2.parse(cb);if(J(cb)){return cb}}return{}}function Z(){if(ag===false){ag=ar()}}function bR(){var cb=new Date();bt=cb.getTime()}function Y(){var cd=new Date(),cb=Math.round(cd.getTime()/1000),cc=bG("id"),cg=av(cc),cf,ce;if(cg){cf=cg.split(".");cf.unshift("0");if(a2.length){cf[1]=a2}return cf}if(a2.length){ce=a2}else{ce=aX((e.userAgent||"")+(e.platform||"")+JSON2.stringify(bT)+cd.getTime()+Math.random()).slice(0,16)}cf=["1",ce,cb,0,cb,"",""];return cf}function aL(){var ce=new Date(),cc=ce.getTime(),cf=bB().createTs;var cb=parseInt(cf,10);var cd=(cb*1000)+aw-cc;return cd}function am(cb){if(!bS){return}var cd=new Date(),cc=Math.round(cd.getTime()/1000);if(!w(cb)){cb=bB()}var ce=cb.uuid+"."+cb.createTs+"."+cb.visitCount+"."+cc+"."+cb.lastVisitTs+"."+cb.lastEcommerceOrderTs;
-bH(bG("id"),ce,aL(),b3,aq)}function X(){var cb=av(bG("ref"));if(cb.length){try{cb=JSON2.parse(cb);if(J(cb)){return cb}}catch(cc){}}return["","",0,""]}function W(){var cb=ao;ao=false;bH(bG("id"),"",-86400,b3,aq);bH(bG("ses"),"",-86400,b3,aq);bH(bG("cvar"),"",-86400,b3,aq);bH(bG("ref"),"",-86400,b3,aq);ao=cb}function b7(cb){bS=cb;am()}function bQ(cf){if(!cf||!J(cf)){return}var ce=[];var cd;for(cd in cf){if(Object.prototype.hasOwnProperty.call(cf,cd)){ce.push(cd)}}var cg={};ce.sort();var cb=ce.length;var cc;for(cc=0;cc<cb;cc++){cg[ce[cc]]=cf[ce[cc]]}return cg}function a4(){bH(bG("ses"),"*",az,b3,aq)}function bB(){var ci=Y();var ce=ci[0];var cf=ci[1];var cc=ci[2];var cb=ci[3];var cg=ci[4];var cd=ci[5];if(!w(ci[6])){ci[6]=""}var ch=ci[6];return{newVisitor:ce,uuid:cf,createTs:cc,visitCount:cb,currentVisitTs:cg,lastVisitTs:cd,lastEcommerceOrderTs:ch}}function aT(cd,cw,cx,ce){var cv,cc=new Date(),ck=Math.round(cc.getTime()/1000),ch,cu,cf=1024,cB,cl,cs=ag,cg=bG("ses"),cq=bG("ref"),cn=bG("cvar"),co=av(cg),ct=X(),cz=a7||b4,ci,cb;
+}function ae(){if(ao){return"0"}if(!w(e.cookieEnabled)){var cb=bG("testcookie");bH(cb,"1");return av(cb)==="1"?"1":"0"}return e.cookieEnabled?"1":"0"}function bk(){by=aX((aq||bM)+(b3||"/")).slice(0,4)}function ar(){var cc=bG("cvar"),cb=av(cc);if(cb.length){cb=JSON2.parse(cb);if(J(cb)){return cb}}return{}}function Z(){if(ag===false){ag=ar()}}function bR(){var cb=new Date();bt=cb.getTime()}function Y(){var cd=new Date(),cb=Math.round(cd.getTime()/1000),cc=bG("id"),cg=av(cc),cf,ce;if(cg){cf=cg.split(".");cf.unshift("0");if(a2.length){cf[1]=a2}return cf}if(a2.length){ce=a2}else{ce=aX((e.userAgent||"")+(e.platform||"")+JSON2.stringify(bT)+cd.getTime()+Math.random()).slice(0,16)}cf=["1",ce,cb,0,cb,"",""];return cf}function bB(){var ci=Y(),ce=ci[0],cf=ci[1],cc=ci[2],cb=ci[3],cg=ci[4],cd=ci[5];if(!w(ci[6])){ci[6]=""}var ch=ci[6];return{newVisitor:ce,uuid:cf,createTs:cc,visitCount:cb,currentVisitTs:cg,lastVisitTs:cd,lastEcommerceOrderTs:ch}}function aL(){var ce=new Date(),cc=ce.getTime(),cf=bB().createTs;
+var cb=parseInt(cf,10);var cd=(cb*1000)+aw-cc;return cd}function am(cb){if(!bS){return}var cd=new Date(),cc=Math.round(cd.getTime()/1000);if(!w(cb)){cb=bB()}var ce=cb.uuid+"."+cb.createTs+"."+cb.visitCount+"."+cc+"."+cb.lastVisitTs+"."+cb.lastEcommerceOrderTs;bH(bG("id"),ce,aL(),b3,aq)}function X(){var cb=av(bG("ref"));if(cb.length){try{cb=JSON2.parse(cb);if(J(cb)){return cb}}catch(cc){}}return["","",0,""]}function W(){var cb=ao;ao=false;bH(bG("id"),"",-86400,b3,aq);bH(bG("ses"),"",-86400,b3,aq);bH(bG("cvar"),"",-86400,b3,aq);bH(bG("ref"),"",-86400,b3,aq);ao=cb}function b7(cb){bS=cb;am()}function bQ(cf){if(!cf||!J(cf)){return}var ce=[];var cd;for(cd in cf){if(Object.prototype.hasOwnProperty.call(cf,cd)){ce.push(cd)}}var cg={};ce.sort();var cb=ce.length;var cc;for(cc=0;cc<cb;cc++){cg[ce[cc]]=cf[ce[cc]]}return cg}function a4(){bH(bG("ses"),"*",az,b3,aq)}function aT(cd,cw,cx,ce){var cv,cc=new Date(),ck=Math.round(cc.getTime()/1000),ch,cu,cf=1024,cB,cl,cs=ag,cg=bG("ses"),cq=bG("ref"),cn=bG("cvar"),co=av(cg),ct=X(),cz=a7||b4,ci,cb;
 if(ao){W()}if(bW){return""}var cp=bB();if(!w(ce)){ce=""}var cm=u.characterSet||u.charset;if(!cm||cm.toLowerCase()==="utf-8"){cm=null}ci=ct[0];cb=ct[1];ch=ct[2];cu=ct[3];if(!co){var cy=az/1000;if(!cp.lastVisitTs||(ck-cp.lastVisitTs)>cy){cp.visitCount++;cp.lastVisitTs=cp.currentVisitTs}if(!a5||!ci.length){for(cv in aY){if(Object.prototype.hasOwnProperty.call(aY,cv)){ci=I(cz,aY[cv]);if(ci.length){break}}}for(cv in aP){if(Object.prototype.hasOwnProperty.call(aP,cv)){cb=I(cz,aP[cv]);if(cb.length){break}}}}cB=b(bu);cl=cu.length?b(cu):"";if(cB.length&&!br(cB)&&(!a5||!cl.length||br(cl))){cu=bu}if(cu.length||ci.length){ch=ck;ct=[ci,cb,ch,bY(cu.slice(0,cf))];bH(cq,JSON2.stringify(ct),ba,b3,aq)}}cd+="&idsite="+bS+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+cc.getHours()+"&m="+cc.getMinutes()+"&s="+cc.getSeconds()+"&url="+l(bY(cz))+(bu.length?"&urlref="+l(bY(bu)):"")+((aJ&&aJ.length)?"&uid="+l(aJ):"")+"&_id="+cp.uuid+"&_idts="+cp.createTs+"&_idvc="+cp.visitCount+"&_idn="+cp.newVisitor+(ci.length?"&_rcn="+l(ci):"")+(cb.length?"&_rck="+l(cb):"")+"&_refts="+ch+"&_viewts="+cp.lastVisitTs+(String(cp.lastEcommerceOrderTs).length?"&_ects="+cp.lastEcommerceOrderTs:"")+(String(cu).length?"&_ref="+l(bY(cu.slice(0,cf))):"")+(cm?"&cs="+l(cm):"")+"&send_image=0";
 for(cv in bT){if(Object.prototype.hasOwnProperty.call(bT,cv)){cd+="&"+cv+"="+bT[cv]}}if(cw){cd+="&data="+l(JSON2.stringify(cw))}else{if(an){cd+="&data="+l(JSON2.stringify(an))}}function cj(cC,cD){var cE=JSON2.stringify(cC);if(cE.length>2){return"&"+cD+"="+l(cE)}return""}var cA=bQ(bg);var cr=bQ(ab);cd+=cj(cA,"cvar");cd+=cj(cr,"e_cvar");if(ag){cd+=cj(ag,"_cvar");for(cv in cs){if(Object.prototype.hasOwnProperty.call(cs,cv)){if(ag[cv][0]===""||ag[cv][1]===""){delete ag[cv]}}}if(a6){bH(cn,JSON2.stringify(ag),az,b3,aq)}}if(a1){if(aI){cd+="&gt_ms="+aI}else{if(f&&f.timing&&f.timing.requestStart&&f.timing.responseEnd){cd+="&gt_ms="+(f.timing.responseEnd-f.timing.requestStart)}}}cp.lastEcommerceOrderTs=w(ce)&&String(ce).length?ce:cp.lastEcommerceOrderTs;am(cp);a4();cd+=O(cx);if(bo.length){cd+="&"+bo}if(q(au)){cd=au(cd)}return cd}function bK(ce,cd,ci,cf,cb,cl){var cg="idgoal=0",ch,cc=new Date(),cj=[],ck;if(String(ce).length){cg+="&ec_id="+l(ce);ch=Math.round(cc.getTime()/1000)}cg+="&revenue="+cd;if(String(ci).length){cg+="&ec_st="+ci
 }if(String(cf).length){cg+="&ec_tx="+cf}if(String(cb).length){cg+="&ec_sh="+cb}if(String(cl).length){cg+="&ec_dt="+cl}if(bF){for(ck in bF){if(Object.prototype.hasOwnProperty.call(bF,ck)){if(!w(bF[ck][1])){bF[ck][1]=""}if(!w(bF[ck][2])){bF[ck][2]=""}if(!w(bF[ck][3])||String(bF[ck][3]).length===0){bF[ck][3]=0}if(!w(bF[ck][4])||String(bF[ck][4]).length===0){bF[ck][4]=1}cj.push(bF[ck])}}cg+="&ec_items="+l(JSON2.stringify(cj))}cg=aT(cg,an,"ecommerce",ch);aZ(cg,bn)}function bJ(cb,cf,ce,cd,cc,cg){if(String(cb).length&&w(cf)){bK(cb,cf,ce,cd,cc,cg)}}function b1(cb){if(w(cb)){bK("",cb,"","","","")}}function be(ce,cf){var cb=new Date(),cd=aT("action_name="+l(V(ce||aS)),cf,"log");aZ(cd,bn);if(aj&&aG&&!bw){bw=true;U(u,"click",bR);U(u,"mouseup",bR);U(u,"mousedown",bR);U(u,"mousemove",bR);U(u,"mousewheel",bR);U(G,"DOMMouseScroll",bR);U(G,"scroll",bR);U(u,"keypress",bR);U(u,"keydown",bR);U(u,"keyup",bR);U(G,"resize",bR);U(G,"focus",bR);U(G,"blur",bR);bt=cb.getTime();setTimeout(function cc(){var cg;cb=new Date();