From 09df90c6ce2ba051993f382f1fa9b7524d282199 Mon Sep 17 00:00:00 2001 From: Lukas Winkler Date: Mon, 18 Jan 2021 22:09:17 +0100 Subject: allow multiple calls to enableLinkTracking (#17101) --- js/piwik.js | 9 +++++---- js/piwik.min.js | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'js') diff --git a/js/piwik.js b/js/piwik.js index 50bfcbda52..ff2f6ac2e9 100644 --- a/js/piwik.js +++ b/js/piwik.js @@ -508,7 +508,7 @@ if (typeof window.Matomo !== 'object') { if ((expireDateTime - aliasTime) > 3000) { expireDateTime = aliasTime + 3000; } - + /* * Delay/pause (blocks UI) */ @@ -5806,7 +5806,7 @@ if (typeof window.Matomo !== 'object') { * then it will only be able to access the cookies if SameSite is set to 'None'. * * - * Warning: + * Warning: * Sets CookieIsSecure to true on None, because None will only work with Secure; cookies * If your site is available under http and https, * using "None" might lead to duplicate or incomplete visits. @@ -5823,7 +5823,7 @@ if (typeof window.Matomo !== 'object') { if (sameSite === 'None') { if (location.protocol === 'https:') { this.setSecureCookie(true); - } else { + } else { logConsoleError('sameSite=None cannot be used on http, reverted to sameSite=Lax.'); sameSite = 'Lax'; } @@ -6918,7 +6918,8 @@ if (typeof window.Matomo !== 'object') { delete paq[iterator]; if (appliedMethods[methodName] > 1 - && methodName !== "addTracker") { + && methodName !== "addTracker" + && methodName !== "enableLinkTracking") { logConsoleError('The method ' + methodName + ' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Matomo trackers documentation: https://developer.matomo.org/guides/tracking-javascript-guide#multiple-piwik-trackers'); } diff --git a/js/piwik.min.js b/js/piwik.min.js index f4bc58d03d..ed15a6d585 100644 --- a/js/piwik.min.js +++ b/js/piwik.min.js @@ -62,7 +62,7 @@ return}if(di==="None"){if(location.protocol==="https:"){this.setSecureCookie(tru var dk=ba(dj);bE.pushMultiple(dk)})}else{p(function(){var dj=v.findContentNodesWithinNode(di);var dk=cz(dj);bE.pushMultiple(dk)})}})};this.trackContentInteraction=function(dk,dl,di,dj){if(N(b7)){return}dk=a(dk);dl=a(dl);di=a(di);dj=a(dj);if(!dk||!dl){return}di=di||"Unknown";ch(function(){var dm=aQ(dk,dl,di,dj);if(dm){bE.push(dm)}})};this.trackContentInteractionNode=function(dk,dj){if(N(b7)||!dk){return}var di=null;ch(function(){di=da(dk,dj);if(di){bE.push(di)}});return di};this.logAllContentBlocksOnPage=function(){var dk=v.findContentNodes();var di=v.collectContent(dk);var dj=typeof console;if(dj!=="undefined"&&console&&console.log){console.log(di)}};this.trackEvent=function(dj,dl,di,dk,dn,dm){ch(function(){at(dj,dl,di,dk,dn,dm)})};this.trackSiteSearch=function(di,dk,dj,dl){cb=[];ch(function(){b9(di,dk,dj,dl)})};this.setEcommerceView=function(dm,di,dk,dj){cs={};if(Y(dk)){dk=String(dk)}if(!J(dk)||dk===null||dk===false||!dk.length){dk=""}else{if(dk instanceof Array){dk=S.JSON.stringify(dk) }}var dl="_pkc";cs[dl]=dk;if(J(dj)&&dj!==null&&dj!==false&&String(dj).length){dl="_pkp";cs[dl]=dj}if(!Y(dm)&&!Y(di)){return}if(Y(dm)){dl="_pks";cs[dl]=dm}if(!Y(di)){di=""}dl="_pkn";cs[dl]=di};this.getEcommerceItems=function(){return JSON.parse(JSON.stringify(c0))};this.addEcommerceItem=function(dm,di,dk,dj,dl){if(Y(dm)){c0[dm]=[String(dm),di,dk,dj,dl]}};this.removeEcommerceItem=function(di){if(Y(di)){di=String(di);delete c0[di]}};this.clearEcommerceCart=function(){c0={}};this.trackEcommerceOrder=function(di,dm,dl,dk,dj,dn){b0(di,dm,dl,dk,dj,dn)};this.trackEcommerceCartUpdate=function(di){bu(di)};this.trackRequest=function(dj,dl,dk,di){ch(function(){var dm=cr(dj,dl,di);bH(dm,bL,dk)})};this.ping=function(){this.trackRequest("ping=1",null,null,"ping")};this.disableQueueRequest=function(){bE.enabled=false};this.setRequestQueueInterval=function(di){if(di<1000){throw new Error("Request queue interval needs to be at least 1000ms")}bE.interval=di};this.queueRequest=function(di){ch(function(){var dj=cr(di); bE.push(dj)})};this.isConsentRequired=function(){return cA};this.getRememberedConsent=function(){var di=aD(be);if(aD(cM)){if(di){bZ(be,br,cX)}return null}if(!di||di===0){return null}return di};this.hasRememberedConsent=function(){return !!this.getRememberedConsent()};this.requireConsent=function(){cA=true;bD=this.hasRememberedConsent();if(!bD){bn=true}x++;b["CoreConsent"+x]={unload:function(){if(!bD){aF()}}}};this.setConsentGiven=function(dj){bD=true;bZ(cM,br,cX);var dk,di;for(dk=0;dk1&&ap!=="addTracker"){ak("The method "+ap+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Matomo trackers documentation: https://developer.matomo.org/guides/tracking-javascript-guide#multiple-piwik-trackers')}av[ap]++}}}}return au}var C=["addTracker","forgetCookieConsentGiven","requireCookieConsent","disableCookies","setTrackerUrl","setAPIUrl","enableCrossDomainLinking","setCrossDomainLinkingTimeout","setSessionCookieTimeout","setVisitorCookieTimeout","setCookieNamePrefix","setCookieSameSite","setSecureCookie","setCookiePath","setCookieDomain","setDomains","setUserId","setVisitorId","setSiteId","alwaysUseSendBeacon","enableLinkTracking","setCookieConsentGiven","requireConsent","setConsentGiven","disablePerformanceTracking"]; +};this.isUserOptedOut=function(){return !bD};this.optUserOut=this.forgetConsentGiven;this.forgetUserOptOut=function(){this.setConsentGiven(false)};m(function(){setTimeout(function(){bG=true},0)});t.trigger("TrackerSetup",[this])}function H(){return{push:af}}function c(au,at){var av={};var aq,ar;for(aq=0;aq1&&ap!=="addTracker"&&ap!=="enableLinkTracking"){ak("The method "+ap+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Matomo trackers documentation: https://developer.matomo.org/guides/tracking-javascript-guide#multiple-piwik-trackers')}av[ap]++}}}}return au}var C=["addTracker","forgetCookieConsentGiven","requireCookieConsent","disableCookies","setTrackerUrl","setAPIUrl","enableCrossDomainLinking","setCrossDomainLinkingTimeout","setSessionCookieTimeout","setVisitorCookieTimeout","setCookieNamePrefix","setCookieSameSite","setSecureCookie","setCookiePath","setCookieDomain","setDomains","setUserId","setVisitorId","setSiteId","alwaysUseSendBeacon","enableLinkTracking","setCookieConsentGiven","requireConsent","setConsentGiven","disablePerformanceTracking"]; function ad(aq,ap){var ao=new P(aq,ap);I.push(ao);_paq=c(_paq,C);for(E=0;E<_paq.length;E++){if(_paq[E]){af(_paq[E])}}_paq=new H();t.trigger("TrackerAdded",[ao]);return ao}an(S,"beforeunload",ai,false);an(S,"online",function(){if(J(g.serviceWorker)&&J(g.serviceWorker.ready)){g.serviceWorker.ready.then(function(ao){return ao.sync.register("matomoSync")})}},false);an(S,"message",function(au){if(!au||!au.origin){return}var aw,ar,ap;var ax=d(au.origin);var at=t.getAsyncTrackers();for(ar=0;ar