Backport support for matomo_ignore class (#16195)

2 files changed, 3 insertions, 3 deletions

diff --git a/js/piwik.js b/js/piwik.js
index ca4dc0d3ab..d9ce30c72e 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -4796,7 +4796,7 @@ if (typeof window.Piwik !== 'object') {
              */
             function getClassesRegExp(configClasses, defaultClass) {
                 var i,
-                    classesRegExp = '(^| )(piwik[_-]' + defaultClass;
+                    classesRegExp = '(^| )(piwik[_-]' + defaultClass + '|matomo[_-]' + defaultClass;
 
                 if (configClasses) {
                     for (i = 0; i < configClasses.length; i++) {
diff --git a/js/piwik.min.js b/js/piwik.min.js
index 7642308816..14d2b29e0e 100644
--- a/js/piwik.min.js
+++ b/js/piwik.min.js
@@ -51,8 +51,8 @@ dg(aU("id"),dp,aH(),bp,cZ,bS)}function bM(){var dl=aD(aU("ref"));if(dl.length){t
 if(bl){aF()}if(cR){return""}var dC=aZ();if(!J(dp)){dp=""}var dz=G.characterSet||G.charset;if(!dz||dz.toLowerCase()==="utf-8"){dz=null}du=dG[0];dl=dG[1];dt=dG[2];dH=dG[3];if(!dB){var dL=cp/1000;if(!dC.lastVisitTs||(dw-dC.lastVisitTs)>dL){dC.visitCount++;dC.lastVisitTs=dC.currentVisitTs}if(!bv||!du.length){for(dI in cr){if(Object.prototype.hasOwnProperty.call(cr,dI)){du=f(dM,cr[dI]);if(du.length){break}}}for(dI in bG){if(Object.prototype.hasOwnProperty.call(bG,dI)){dl=f(dM,bG[dI]);if(dl.length){break}}}}dQ=d(bn);dx=dH.length?d(dH):"";if(dQ.length&&!aW(dQ)&&(!bv||!dx.length||aW(dx))){dH=bn}if(dH.length||du.length){dt=dw;dG=[du,dl,dt,b2(dH.slice(0,dq))];dg(dD,JSON_PIWIK.stringify(dG),c7,bp,cZ)}}dn+="&idsite="+b6+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+dm.getHours()+"&m="+dm.getMinutes()+"&s="+dm.getSeconds()+"&url="+t(b2(dM))+(bn.length?"&urlref="+t(b2(bn)):"")+((by&&by.length)?"&uid="+t(by):"")+"&_id="+dC.uuid+"&_idts="+dC.createTs+"&_idvc="+dC.visitCount+"&_idn="+dC.newVisitor+(du.length?"&_rcn="+t(du):"")+(dl.length?"&_rck="+t(dl):"")+"&_refts="+dt+"&_viewts="+dC.lastVisitTs+(String(dC.lastEcommerceOrderTs).length?"&_ects="+dC.lastEcommerceOrderTs:"")+(String(dH).length?"&_ref="+t(b2(dH.slice(0,dq))):"")+(dz?"&cs="+t(dz):"")+"&send_image=0";
 var dP=cI();for(dI in dP){if(Object.prototype.hasOwnProperty.call(dP,dI)){dn+="&"+dI+"="+dP[dI]}}var dO=[];if(dJ){for(dI in dJ){if(Object.prototype.hasOwnProperty.call(dJ,dI)&&/^dimension\d+$/.test(dI)){var ds=dI.replace("dimension","");dO.push(parseInt(ds,10));dO.push(String(ds));dn+="&"+dI+"="+t(dJ[dI]);delete dJ[dI]}}}if(dJ&&B(dJ)){dJ=null}for(dI in bm){if(Object.prototype.hasOwnProperty.call(bm,dI)){var dy=(-1===M(dO,dI));if(dy){dn+="&dimension"+dI+"="+t(bm[dI])}}}if(dJ){dn+="&data="+t(JSON_PIWIK.stringify(dJ))}else{if(ao){dn+="&data="+t(JSON_PIWIK.stringify(ao))}}function dv(dR,dS){var dT=JSON_PIWIK.stringify(dR);if(dT.length>2){return"&"+dS+"="+t(dT)}return""}var dN=dk(bW);var dE=dk(cm);dn+=dv(dN,"cvar");dn+=dv(dE,"e_cvar");if(aR){dn+=dv(aR,"_cvar");for(dI in dF){if(Object.prototype.hasOwnProperty.call(dF,dI)){if(aR[dI][0]===""||aR[dI][1]===""){delete aR[dI]}}}if(bQ){dg(dA,JSON_PIWIK.stringify(aR),cp,bp,cZ)}}if(a3){if(cn){dn+="&gt_ms="+cn}else{if(i&&i.timing&&i.timing.requestStart&&i.timing.responseEnd){dn+="&gt_ms="+(i.timing.responseEnd-i.timing.requestStart)
 }}}if(aL){dn+="&pv_id="+aL}dC.lastEcommerceOrderTs=J(dp)&&String(dp).length?dp:dC.lastEcommerceOrderTs;aM(dC);cd();dn+=ac(dK,{tracker:bI,request:dn});if(c1.length){dn+="&"+c1}if(A(cb)){dn=cb(dn)}return dn}bR=function a8(){var dl=new Date();dl=dl.getTime();if(!c0){return false}if((c0+(1000*c9))<=dl){return false}if(c0+a6<=dl){bI.ping();return true}return false};function bq(dp,dn,du,dq,dl,dx){var ds="idgoal=0",dt,dm=new Date(),dv=[],dw,dr=String(dp).length;if(dr){ds+="&ec_id="+t(dp);dt=Math.round(dm.getTime()/1000)}ds+="&revenue="+dn;if(String(du).length){ds+="&ec_st="+du}if(String(dq).length){ds+="&ec_tx="+dq}if(String(dl).length){ds+="&ec_sh="+dl}if(String(dx).length){ds+="&ec_dt="+dx}if(c2){for(dw in c2){if(Object.prototype.hasOwnProperty.call(c2,dw)){if(!J(c2[dw][1])){c2[dw][1]=""}if(!J(c2[dw][2])){c2[dw][2]=""}if(!J(c2[dw][3])||String(c2[dw][3]).length===0){c2[dw][3]=0}if(!J(c2[dw][4])||String(c2[dw][4]).length===0){c2[dw][4]=1}dv.push(c2[dw])}}ds+="&ec_items="+t(JSON_PIWIK.stringify(dv))
-}ds=ct(ds,ao,"ecommerce",dt);bF(ds,bJ);if(dr){c2={}}}function bZ(dl,dq,dp,dn,dm,dr){if(String(dl).length&&J(dq)){bq(dl,dq,dp,dn,dm,dr)}}function bs(dl){if(J(dl)){bq("",dl,"","","","")}}function b0(dm,dp,dn){aL=bh();var dl=ct("action_name="+t(al(dm||bj)),dp,"log");bF(dl,bJ,dn)}function a1(dn,dm){var dp,dl="(^| )(piwik[_-]"+dm;if(dn){for(dp=0;dp<dn.length;dp++){dl+="|"+dn[dp]}}dl+=")( |$)";return new RegExp(dl)}function aV(dl){return(aE&&dl&&0===String(dl).indexOf(aE))}function cv(dq,dl,dr,dm){if(aV(dl)){return 0}var dp=a1(bL,"download"),dn=a1(a9,"link"),ds=new RegExp("\\.("+c8.join("|")+")([?&#]|$)","i");if(dn.test(dq)){return"link"}if(dm||dp.test(dq)||ds.test(dl)){return"download"}if(dr){return 0}return"link"}function au(dm){var dl;dl=dm.parentNode;while(dl!==null&&J(dl)){if(ae.isLinkElement(dm)){break}dm=dl;dl=dm.parentNode}return dm}function de(dr){dr=au(dr);if(!ae.hasNodeAttribute(dr,"href")){return}if(!J(dr.href)){return}var dq=ae.getAttributeValueFromNode(dr,"href");if(aV(dq)){return
-}var dm=dr.pathname||cl(dr.href);var ds=dr.hostname||d(dr.href);var dt=ds.toLowerCase();var dn=dr.href.replace(ds,dt);var dp=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto|tel):","i");if(!dp.test(dn)){var dl=cv(dr.className,dn,ar(dt,dm),ae.hasNodeAttribute(dr,"download"));if(dl){return{type:dl,href:dn}}}}function aQ(dl,dm,dn,dp){var dq=v.buildInteractionRequestParams(dl,dm,dn,dp);if(!dq){return}return ct(dq,null,"contentInteraction")}function cM(dn,dp,dt,dl,dm){if(!J(dn)){return}if(aV(dn)){return dn}var dr=v.toAbsoluteUrl(dn);var dq="redirecturl="+t(dr)+"&";dq+=aQ(dp,dt,dl,(dm||dn));var ds="&";if(aE.indexOf("?")<0){ds="?"}return aE+ds+dq}function bc(dl,dm){if(!dl||!dm){return false}var dn=v.findTargetNode(dl);if(v.shouldIgnoreInteraction(dn)){return false}dn=v.findTargetNodeNoDefault(dl);if(dn&&!V(dn,dm)){return false}return true}function cu(dn,dm,dq){if(!dn){return}var dl=v.findParentContentNode(dn);if(!dl){return}if(!bc(dl,dn)){return}var dp=v.buildContentBlock(dl);
+}ds=ct(ds,ao,"ecommerce",dt);bF(ds,bJ);if(dr){c2={}}}function bZ(dl,dq,dp,dn,dm,dr){if(String(dl).length&&J(dq)){bq(dl,dq,dp,dn,dm,dr)}}function bs(dl){if(J(dl)){bq("",dl,"","","","")}}function b0(dm,dp,dn){aL=bh();var dl=ct("action_name="+t(al(dm||bj)),dp,"log");bF(dl,bJ,dn)}function a1(dn,dm){var dp,dl="(^| )(piwik[_-]"+dm+"|matomo[_-]"+dm;if(dn){for(dp=0;dp<dn.length;dp++){dl+="|"+dn[dp]}}dl+=")( |$)";return new RegExp(dl)}function aV(dl){return(aE&&dl&&0===String(dl).indexOf(aE))}function cv(dq,dl,dr,dm){if(aV(dl)){return 0}var dp=a1(bL,"download"),dn=a1(a9,"link"),ds=new RegExp("\\.("+c8.join("|")+")([?&#]|$)","i");if(dn.test(dq)){return"link"}if(dm||dp.test(dq)||ds.test(dl)){return"download"}if(dr){return 0}return"link"}function au(dm){var dl;dl=dm.parentNode;while(dl!==null&&J(dl)){if(ae.isLinkElement(dm)){break}dm=dl;dl=dm.parentNode}return dm}function de(dr){dr=au(dr);if(!ae.hasNodeAttribute(dr,"href")){return}if(!J(dr.href)){return}var dq=ae.getAttributeValueFromNode(dr,"href");
+if(aV(dq)){return}var dm=dr.pathname||cl(dr.href);var ds=dr.hostname||d(dr.href);var dt=ds.toLowerCase();var dn=dr.href.replace(ds,dt);var dp=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto|tel):","i");if(!dp.test(dn)){var dl=cv(dr.className,dn,ar(dt,dm),ae.hasNodeAttribute(dr,"download"));if(dl){return{type:dl,href:dn}}}}function aQ(dl,dm,dn,dp){var dq=v.buildInteractionRequestParams(dl,dm,dn,dp);if(!dq){return}return ct(dq,null,"contentInteraction")}function cM(dn,dp,dt,dl,dm){if(!J(dn)){return}if(aV(dn)){return dn}var dr=v.toAbsoluteUrl(dn);var dq="redirecturl="+t(dr)+"&";dq+=aQ(dp,dt,dl,(dm||dn));var ds="&";if(aE.indexOf("?")<0){ds="?"}return aE+ds+dq}function bc(dl,dm){if(!dl||!dm){return false}var dn=v.findTargetNode(dl);if(v.shouldIgnoreInteraction(dn)){return false}dn=v.findTargetNodeNoDefault(dl);if(dn&&!V(dn,dm)){return false}return true}function cu(dn,dm,dq){if(!dn){return}var dl=v.findParentContentNode(dn);if(!dl){return}if(!bc(dl,dn)){return}var dp=v.buildContentBlock(dl);
 if(!dp){return}if(!dp.target&&dq){dp.target=dq}return v.buildInteractionRequestParams(dm,dp.name,dp.piece,dp.target)}function aX(dm){if(!ca||!ca.length){return false}var dl,dn;for(dl=0;dl<ca.length;dl++){dn=ca[dl];if(dn&&dn.name===dm.name&&dn.piece===dm.piece&&dn.target===dm.target){return true}}return false}function bE(dp){if(!dp){return false}var ds=v.findTargetNode(dp);if(!ds||v.shouldIgnoreInteraction(ds)){return false}var dt=de(ds);if(db&&dt&&dt.type){return false}if(ae.isLinkElement(ds)&&ae.hasNodeAttributeWithValue(ds,"href")){var dl=String(ae.getAttributeValueFromNode(ds,"href"));if(0===dl.indexOf("#")){return false}if(aV(dl)){return true}if(!v.isUrlToCurrentDomain(dl)){return false}var dq=v.buildContentBlock(dp);if(!dq){return}var dn=dq.name;var du=dq.piece;var dr=dq.target;if(!ae.hasNodeAttributeWithValue(ds,v.CONTENT_TARGET_ATTR)||ds.wasContentTargetAttrReplaced){ds.wasContentTargetAttrReplaced=true;dr=v.toAbsoluteUrl(dl);ae.setAnyAttribute(ds,v.CONTENT_TARGET_ATTR,dr)}var dm=cM(dl,"click",dn,du,dr);
 v.setHrefAttribute(ds,dm);return true}return false}function aN(dm){if(!dm||!dm.length){return}var dl;for(dl=0;dl<dm.length;dl++){bE(dm[dl])}}function aY(dl){return function(dm){if(!dl){return}var dq=v.findParentContentNode(dl);var dr;if(dm){dr=dm.target||dm.srcElement}if(!dr){dr=dl}if(!bc(dq,dr)){return}cg(bJ);if(ae.isLinkElement(dl)&&ae.hasNodeAttributeWithValue(dl,"href")&&ae.hasNodeAttributeWithValue(dl,v.CONTENT_TARGET_ATTR)){var dn=ae.getAttributeValueFromNode(dl,"href");if(!aV(dn)&&dl.wasContentTargetAttrReplaced){ae.setAnyAttribute(dl,v.CONTENT_TARGET_ATTR,"")}}var dv=de(dl);if(ap&&dv&&dv.type){return dv.type}if(bE(dq)){return"href"}var ds=v.buildContentBlock(dq);if(!ds){return}var dp=ds.name;var dw=ds.piece;var du=ds.target;var dt=aQ("click",dp,dw,du);if(dt){bF(dt,bJ)}return dt}}function b1(dn){if(!dn||!dn.length){return}var dl,dm;for(dl=0;dl<dn.length;dl++){dm=v.findTargetNode(dn[dl]);if(dm&&!dm.contentInteractionTrackingSetupDone){dm.contentInteractionTrackingSetupDone=true;an(dm,"click",aY(dm))
 }}}function bx(dn,dp){if(!dn||!dn.length){return[]}var dl,dm;for(dl=0;dl<dn.length;dl++){if(aX(dn[dl])){dn.splice(dl,1);dl--}else{ca.push(dn[dl])}}if(!dn||!dn.length){return[]}aN(dp);b1(dp);var dq=[];for(dl=0;dl<dn.length;dl++){dm=ct(v.buildImpressionRequestParams(dn[dl].name,dn[dl].piece,dn[dl].target),undefined,"contentImpressions");if(dm){dq.push(dm)}}return dq}function cz(dm){var dl=v.collectContent(dm);return bx(dl,dm)}function ba(dm){if(!dm||!dm.length){return[]}var dl;for(dl=0;dl<dm.length;dl++){if(!v.isNodeVisible(dm[dl])){dm.splice(dl,1);dl--}}if(!dm||!dm.length){return[]}return cz(dm)}function aG(dn,dl,dm){var dp=v.buildImpressionRequestParams(dn,dl,dm);return ct(dp,null,"contentImpression")}function dd(dp,dm){if(!dp){return}var dl=v.findParentContentNode(dp);var dn=v.buildContentBlock(dl);if(!dn){return}if(!dm){dm="Unknown"}return aQ(dm,dn.name,dn.piece,dn.target)}function cQ(dm,dp,dl,dn){return"e_c="+t(dm)+"&e_a="+t(dp)+(J(dl)?"&e_n="+t(dl):"")+(J(dn)?"&e_v="+t(dn):"")}function at(dn,dq,dl,dp,ds,dr){if(a(String(dn)).length===0||a(String(dq)).length===0){ak("Error while logging event: Parameters `category` and `action` must not be empty or filled with whitespaces");