Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorMikhail Snetkov <ufoproger@gmail.com>2021-03-02 08:25:37 +0300
committerGitHub <noreply@github.com>2021-03-02 08:25:37 +0300
commit6e0302642443bb36fa932c4f2d9074b52374c86b (patch)
tree52e42aa95ed001d142c8865cb62a4bbc0c42d9ee /js
parent813e637fa4c40cdafb1aa2780f7c5f22850ad2b8 (diff)
Do not append performance metrics to page view log if performance tracking disabled (#17268)
* Do not append performance metrics to page view log if performance tracking disabled * Rebuild piwik.js
Diffstat (limited to 'js')
-rw-r--r--js/piwik.js2
-rw-r--r--js/piwik.min.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/js/piwik.js b/js/piwik.js
index 227e3472f2..0a94b71449 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -3879,7 +3879,7 @@ if (typeof window.Matomo !== 'object') {
var request = getRequest('action_name=' + encodeWrapper(titleFixup(customTitle || configTitle)), customData, 'log');
// append already available performance metrics if they were not already tracked (or appended)
- if (!performanceTracked) {
+ if (configPerformanceTrackingEnabled && !performanceTracked) {
request = appendAvailablePerformanceMetrics(request);
}
diff --git a/js/piwik.min.js b/js/piwik.min.js
index 24e3c50960..cecc0b6f7b 100644
--- a/js/piwik.min.js
+++ b/js/piwik.min.js
@@ -42,7 +42,7 @@ if(dm.length===32&&dk.test(dm)){var dj=dm.substr(16,32);if(c2(dj)){var dl=dm.sub
}di+="&pf_srv="+(dk.responseStart-dk.requestStart)}if(dk.responseStart&&dk.responseEnd){if(dk.responseEnd<dk.responseStart){return}di+="&pf_tfr="+(dk.responseEnd-dk.responseStart)}if(dk.domInteractive&&dk.domLoading){if(dk.domInteractive<dk.domLoading){return}di+="&pf_dm1="+(dk.domInteractive-dk.domLoading)}if(dk.domComplete&&dk.domInteractive){if(dk.domComplete<dk.domInteractive){return}di+="&pf_dm2="+(dk.domComplete-dk.domInteractive)}if(dk.loadEventEnd&&dk.loadEventStart){if(dk.loadEventEnd<dk.loadEventStart){return}di+="&pf_onl="+(dk.loadEventEnd-dk.loadEventStart)}return dj+di}function cr(dk,dF,dG){var dE,dj=new Date(),ds=Math.round(dj.getTime()/1000),dp,dC,dl=1024,dL,dt,dB=aR,dm=aU("ses"),dz=aU("ref"),dw=aU("cvar"),dx=aD(dm),dD=bN(),dH=a5||bO,dq,di;if(bn){aF()}if(cQ){return""}var dy=aZ();var dv=G.characterSet||G.charset;if(!dv||dv.toLowerCase()==="utf-8"){dv=null}dq=dD[0];di=dD[1];dp=dD[2];dC=dD[3];if(!dx){if(!bx||!dq.length){for(dE in cp){if(Object.prototype.hasOwnProperty.call(cp,dE)){dq=e(dH,cp[dE]);
if(dq.length){break}}}for(dE in bI){if(Object.prototype.hasOwnProperty.call(bI,dE)){di=e(dH,bI[dE]);if(di.length){break}}}}dL=d(bp);dt=dC.length?d(dC):"";if(dL.length&&!aW(dL)&&(!bx||!dt.length||aW(dt))){dC=bp}if(dC.length||dq.length){dp=ds;dD=[dq,di,dp,b3(dC.slice(0,dl))];dd(dz,S.JSON.stringify(dD),c5,br,cX,bT,aJ)}}dk+="&idsite="+b7+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+dj.getHours()+"&m="+dj.getMinutes()+"&s="+dj.getSeconds()+"&url="+s(b3(dH))+(bp.length?"&urlref="+s(b3(bp)):"")+(Y(bA)?"&uid="+s(bA):"")+"&_id="+dy.uuid+"&_idn="+dy.newVisitor+(dq.length?"&_rcn="+s(dq):"")+(di.length?"&_rck="+s(di):"")+"&_refts="+dp+(String(dC).length?"&_ref="+s(b3(dC.slice(0,dl))):"")+(dv?"&cs="+s(dv):"")+"&send_image=0";var dK=cI();for(dE in dK){if(Object.prototype.hasOwnProperty.call(dK,dE)){dk+="&"+dE+"="+dK[dE]}}var dJ=[];if(dF){for(dE in dF){if(Object.prototype.hasOwnProperty.call(dF,dE)&&/^dimension\d+$/.test(dE)){var dn=dE.replace("dimension","");dJ.push(parseInt(dn,10));dJ.push(String(dn));
dk+="&"+dE+"="+s(dF[dE]);delete dF[dE]}}}if(dF&&B(dF)){dF=null}for(dE in cs){if(Object.prototype.hasOwnProperty.call(cs,dE)){dk+="&"+dE+"="+s(cs[dE])}}for(dE in bo){if(Object.prototype.hasOwnProperty.call(bo,dE)){var du=(-1===M(dJ,dE));if(du){dk+="&dimension"+dE+"="+s(bo[dE])}}}if(dF){dk+="&data="+s(S.JSON.stringify(dF))}else{if(ao){dk+="&data="+s(S.JSON.stringify(ao))}}function dr(dM,dN){var dO=S.JSON.stringify(dM);if(dO.length>2){return"&"+dN+"="+s(dO)}return""}var dI=dh(bX);var dA=dh(cm);dk+=dr(dI,"cvar");dk+=dr(dA,"e_cvar");if(aR){dk+=dr(aR,"_cvar");for(dE in dB){if(Object.prototype.hasOwnProperty.call(dB,dE)){if(aR[dE][0]===""||aR[dE][1]===""){delete aR[dE]}}}if(bR){dd(dw,S.JSON.stringify(aR),cn,br,cX,bT,aJ)}}if(a3&&bG&&!bi){dk=aA(dk);bi=true}if(aM){dk+="&pv_id="+aM}aN(dy);cd();dk+=ac(dG,{tracker:bK,request:dk});if(cZ.length){dk+="&"+cZ}if(A(cc)){dk=cc(dk)}return dk}bS=function a8(){var di=new Date();di=di.getTime();if(!cY){return false}if(cY+a6<=di){bK.ping();return true}return false
-};function bs(dl,dk,dq,dm,di,dt){var dp="idgoal=0",dj=new Date(),dr=[],ds,dn=String(dl).length;if(dn){dp+="&ec_id="+s(dl)}dp+="&revenue="+dk;if(String(dq).length){dp+="&ec_st="+dq}if(String(dm).length){dp+="&ec_tx="+dm}if(String(di).length){dp+="&ec_sh="+di}if(String(dt).length){dp+="&ec_dt="+dt}if(c0){for(ds in c0){if(Object.prototype.hasOwnProperty.call(c0,ds)){if(!J(c0[ds][1])){c0[ds][1]=""}if(!J(c0[ds][2])){c0[ds][2]=""}if(!J(c0[ds][3])||String(c0[ds][3]).length===0){c0[ds][3]=0}if(!J(c0[ds][4])||String(c0[ds][4]).length===0){c0[ds][4]=1}dr.push(c0[ds])}}dp+="&ec_items="+s(S.JSON.stringify(dr))}dp=cr(dp,ao,"ecommerce");bH(dp,bL);if(dn){c0={}}}function b0(di,dm,dl,dk,dj,dn){if(String(di).length&&J(dm)){bs(di,dm,dl,dk,dj,dn)}}function bu(di){if(J(di)){bs("",di,"","","","")}}function b1(dj,dl,dk){aM=bh();var di=cr("action_name="+s(al(dj||bk)),dl,"log");if(!bi){di=aA(di)}bH(di,bL,dk)}function a1(dk,dj){var dl,di="(^| )(piwik[_-]"+dj+"|matomo[_-]"+dj;if(dk){for(dl=0;dl<dk.length;dl++){di+="|"+dk[dl]
+};function bs(dl,dk,dq,dm,di,dt){var dp="idgoal=0",dj=new Date(),dr=[],ds,dn=String(dl).length;if(dn){dp+="&ec_id="+s(dl)}dp+="&revenue="+dk;if(String(dq).length){dp+="&ec_st="+dq}if(String(dm).length){dp+="&ec_tx="+dm}if(String(di).length){dp+="&ec_sh="+di}if(String(dt).length){dp+="&ec_dt="+dt}if(c0){for(ds in c0){if(Object.prototype.hasOwnProperty.call(c0,ds)){if(!J(c0[ds][1])){c0[ds][1]=""}if(!J(c0[ds][2])){c0[ds][2]=""}if(!J(c0[ds][3])||String(c0[ds][3]).length===0){c0[ds][3]=0}if(!J(c0[ds][4])||String(c0[ds][4]).length===0){c0[ds][4]=1}dr.push(c0[ds])}}dp+="&ec_items="+s(S.JSON.stringify(dr))}dp=cr(dp,ao,"ecommerce");bH(dp,bL);if(dn){c0={}}}function b0(di,dm,dl,dk,dj,dn){if(String(di).length&&J(dm)){bs(di,dm,dl,dk,dj,dn)}}function bu(di){if(J(di)){bs("",di,"","","","")}}function b1(dj,dl,dk){aM=bh();var di=cr("action_name="+s(al(dj||bk)),dl,"log");if(a3&&!bi){di=aA(di)}bH(di,bL,dk)}function a1(dk,dj){var dl,di="(^| )(piwik[_-]"+dj+"|matomo[_-]"+dj;if(dk){for(dl=0;dl<dk.length;dl++){di+="|"+dk[dl]
}}di+=")( |$)";return new RegExp(di)}function aV(di){return(aE&&di&&0===String(di).indexOf(aE))}function cu(dm,di,dn,dj){if(aV(di)){return 0}var dl=a1(bM,"download"),dk=a1(a9,"link"),dp=new RegExp("\\.("+c6.join("|")+")([?&#]|$)","i");if(dk.test(dm)){return"link"}if(dj||dl.test(dm)||dp.test(di)){return"download"}if(dn){return 0}return"link"}function au(dj){var di;di=dj.parentNode;while(di!==null&&J(di)){if(ae.isLinkElement(dj)){break}dj=di;di=dj.parentNode}return dj}function db(dn){dn=au(dn);if(!ae.hasNodeAttribute(dn,"href")){return}if(!J(dn.href)){return}var dm=ae.getAttributeValueFromNode(dn,"href");var dj=dn.pathname||cl(dn.href);var dp=dn.hostname||d(dn.href);var dq=dp.toLowerCase();var dk=dn.href.replace(dp,dq);var dl=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto|tel):","i");if(!dl.test(dk)){var di=cu(dn.className,dk,ar(dq,dj),ae.hasNodeAttribute(dn,"download"));if(di){return{type:di,href:dk}}}}function aQ(di,dj,dk,dl){var dm=v.buildInteractionRequestParams(di,dj,dk,dl);
if(!dm){return}return cr(dm,null,"contentInteraction")}function bc(di,dj){if(!di||!dj){return false}var dk=v.findTargetNode(di);if(v.shouldIgnoreInteraction(dk)){return false}dk=v.findTargetNodeNoDefault(di);if(dk&&!U(dk,dj)){return false}return true}function ct(dk,dj,dm){if(!dk){return}var di=v.findParentContentNode(dk);if(!di){return}if(!bc(di,dk)){return}var dl=v.buildContentBlock(di);if(!dl){return}if(!dl.target&&dm){dl.target=dm}return v.buildInteractionRequestParams(dj,dl.name,dl.piece,dl.target)}function aX(dj){if(!cb||!cb.length){return false}var di,dk;for(di=0;di<cb.length;di++){dk=cb[di];if(dk&&dk.name===dj.name&&dk.piece===dj.piece&&dk.target===dj.target){return true}}return false}function aY(di){return function(dm){if(!di){return}var dk=v.findParentContentNode(di);var dj;if(dm){dj=dm.target||dm.srcElement}if(!dj){dj=di}if(!bc(dk,dj)){return}if(!dk){return false}var dn=v.findTargetNode(dk);if(!dn||v.shouldIgnoreInteraction(dn)){return false}var dl=db(dn);if(c8&&dl&&dl.type){return dl.type
}return bK.trackContentInteractionNode(dj,"click")}}function b2(dk){if(!dk||!dk.length){return}var di,dj;for(di=0;di<dk.length;di++){dj=v.findTargetNode(dk[di]);if(dj&&!dj.contentInteractionTrackingSetupDone){dj.contentInteractionTrackingSetupDone=true;an(dj,"click",aY(dj))}}}function bz(dk,dl){if(!dk||!dk.length){return[]}var di,dj;for(di=0;di<dk.length;di++){if(aX(dk[di])){dk.splice(di,1);di--}else{cb.push(dk[di])}}if(!dk||!dk.length){return[]}b2(dl);var dm=[];for(di=0;di<dk.length;di++){dj=cr(v.buildImpressionRequestParams(dk[di].name,dk[di].piece,dk[di].target),undefined,"contentImpressions");if(dj){dm.push(dj)}}return dm}function cz(dj){var di=v.collectContent(dj);return bz(di,dj)}function ba(dj){if(!dj||!dj.length){return[]}var di;for(di=0;di<dj.length;di++){if(!v.isNodeVisible(dj[di])){dj.splice(di,1);di--}}if(!dj||!dj.length){return[]}return cz(dj)}function aG(dk,di,dj){var dl=v.buildImpressionRequestParams(dk,di,dj);return cr(dl,null,"contentImpression")}function da(dl,dj){if(!dl){return