Use detachEvent when removeEventListener isn't available (#18110)

* update removeEventListener to detachEvent

follow pr 18028 fix for update removeEventListener to detachEvent

* rebuilt piwik.js

Co-authored-by: peterhashair <peterhashair@users.noreply.github.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/js/piwik.js b/js/piwik.js
index 0e158bc96c..25767400f2 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -6296,7 +6296,7 @@ if (typeof window.Matomo !== 'object') {
                     } else if  (windowAlias.detachEvent) {
                         windowAlias.detachEvent('onfocus', heartBeatOnFocus);
                         windowAlias.detachEvent('onblur', heartBeatOnBlur);
-                        windowAlias.removeEventListener('visibilitychange', heartBeatOnVisible);
+                        windowAlias.detachEvent('visibilitychange', heartBeatOnVisible);
                     }
                 }
 
diff --git a/js/piwik.min.js b/js/piwik.min.js
index da73c1d481..4bcf591b02 100644
--- a/js/piwik.min.js
+++ b/js/piwik.min.js
@@ -58,10 +58,10 @@ if(!dt){return false}var ds=dv.pathname||cr(dv.href);var du=(dv.hostname||d(dv.h
 }};this.setReferrerUrl=function(ds){bu=ds};this.setCustomUrl=function(ds){ba=b1(bT,ds)};this.getCurrentUrl=function(){return ba||bT};this.setDocumentTitle=function(ds){bp=ds};this.setPageViewId=function(ds){aQ=ds;bH=true};this.setAPIUrl=function(ds){bO=ds};this.setDownloadClasses=function(ds){bR=x(ds)?[ds]:ds};this.setLinkClasses=function(ds){be=x(ds)?[ds]:ds};this.setCampaignNameKey=function(ds){cw=x(ds)?[ds]:ds};this.setCampaignKeywordKey=function(ds){bN=x(ds)?[ds]:ds};this.discardHashTag=function(ds){bV=ds};this.setCookieNamePrefix=function(ds){bq=ds;if(aV){aV=b3()}};this.setCookieDomain=function(ds){var dt=O(ds);if(!bs&&!bD(dt)){ao("Can't write cookie on domain "+ds)}else{c6=dt;bo()}};this.setExcludedQueryParams=function(ds){co=x(ds)?[ds]:ds};this.getCookieDomain=function(){return c6};this.hasCookies=function(){return"1"===cb()};this.setSessionCookie=function(du,dt,ds){if(!du){throw new Error("Missing cookie name")}if(!M(ds)){ds=cu}bB.push(du);dm(aY(du),dt,ds,bw,c6,bY,aN)};this.getCookie=function(dt){var ds=aH(aY(dt));
 if(ds===0){return null}return ds};this.setCookiePath=function(ds){bw=ds;bo()};this.getCookiePath=function(ds){return bw};this.setVisitorCookieTimeout=function(ds){cS=ds*1000};this.setSessionCookieTimeout=function(ds){cu=ds*1000};this.getSessionCookieTimeout=function(){return cu};this.setReferralCookieTimeout=function(ds){de=ds*1000};this.setConversionAttributionFirstReferrer=function(ds){bC=ds};this.setSecureCookie=function(ds){if(ds&&location.protocol!=="https:"){ao("Error in setSecureCookie: You cannot use `Secure` on http.");return}bY=ds};this.setCookieSameSite=function(ds){ds=String(ds);ds=ds.charAt(0).toUpperCase()+ds.toLowerCase().slice(1);if(ds!=="None"&&ds!=="Lax"&&ds!=="Strict"){ao("Ignored value for sameSite. Please use either Lax, None, or Strict.");return}if(ds==="None"){if(location.protocol==="https:"){this.setSecureCookie(true)}else{ao("sameSite=None cannot be used on http, reverted to sameSite=Lax.");ds="Lax"}}aN=ds};this.disableCookies=function(){bs=true;if(cc){aJ()}};this.areCookiesEnabled=function(){return !bs
 };this.setCookieConsentGiven=function(){if(bs&&!cY){bs=false;if(cc&&aA){aR();var ds=cy("ping=1",null,"ping");bM(ds,bQ)}}};this.requireCookieConsent=function(){if(this.getRememberedCookieConsent()){return false}this.disableCookies();return true};this.getRememberedCookieConsent=function(){return aH(cL)};this.forgetCookieConsentGiven=function(){b5(cL,bw,c6);this.disableCookies()};this.rememberCookieConsentGiven=function(dt){if(dt){dt=dt*60*60*1000}else{dt=30*365*24*60*60*1000}this.setCookieConsentGiven();var ds=new Date().getTime();dm(cL,ds,dt,bw,c6,bY,aN)};this.deleteCookies=function(){aJ()};this.setDoNotTrack=function(dt){var ds=g.doNotTrack||g.msDoNotTrack;cY=dt&&(ds==="yes"||ds==="1");if(cY){this.disableCookies()}};this.alwaysUseSendBeacon=function(){c5=true};this.disableAlwaysUseSendBeacon=function(){c5=false};this.addListener=function(dt,ds){av(dt,ds,false)};this.enableLinkTracking=function(dt){if(dh){return}dh=true;var ds=this;q(function(){au=true;var du=J.body;av(du,dt,true)})};this.enableJSErrorTracking=function(){if(c0){return
-}c0=true;var ds=W.onerror;W.onerror=function(dx,dv,du,dw,dt){cm(function(){var dy="JavaScript Errors";var dz=dv+":"+du;if(dw){dz+=":"+dw}if(P(cz,dy+dz+dx)===-1){cz.push(dy+dz+dx);ax(dy,dz,dx)}});if(ds){return ds(dx,dv,du,dw,dt)}return false}};this.disablePerformanceTracking=function(){a8=false};this.enableHeartBeatTimer=function(ds){ds=Math.max(ds||15,5);bb=ds*1000;if(c7!==null){dp()}};this.disableHeartBeatTimer=function(){if(bb||aS){if(W.removeEventListener){W.removeEventListener("focus",bg);W.removeEventListener("blur",aD);W.removeEventListener("visibilitychange",a0)}else{if(W.detachEvent){W.detachEvent("onfocus",bg);W.detachEvent("onblur",aD);W.removeEventListener("visibilitychange",a0)}}}bb=null;aS=false};this.killFrame=function(){if(W.location!==W.top.location){W.top.location=W.location}};this.redirectFile=function(ds){if(W.location.protocol==="file:"){W.location=ds}};this.setCountPreRendered=function(ds){bk=ds};this.trackGoal=function(ds,dv,du,dt){cm(function(){c1(ds,dv,du,dt)})};
-this.trackLink=function(dt,ds,dv,du){cm(function(){da(dt,ds,dv,du)})};this.getNumTrackedPageViews=function(){return cx};this.trackPageView=function(ds,du,dt){cg=[];cT=[];cz=[];if(R(cc)){cm(function(){ad(aI,bO,cc)})}else{cm(function(){cx++;b6(ds,du,dt)})}};this.trackAllContentImpressions=function(){if(R(cc)){return}cm(function(){q(function(){var ds=w.findContentNodes();var dt=cH(ds);bK.pushMultiple(dt)})})};this.trackVisibleContentImpressions=function(ds,dt){if(R(cc)){return}if(!M(ds)){ds=true}if(!M(dt)){dt=750}aX(ds,dt,this);cm(function(){n(function(){var du=w.findContentNodes();var dv=bf(du);bK.pushMultiple(dv)})})};this.trackContentImpression=function(du,ds,dt){if(R(cc)){return}du=a(du);ds=a(ds);dt=a(dt);if(!du){return}ds=ds||"Unknown";cm(function(){var dv=aK(du,ds,dt);bK.push(dv)})};this.trackContentImpressionsWithinNode=function(ds){if(R(cc)||!ds){return}cm(function(){if(ck){n(function(){var dt=w.findContentNodesWithinNode(ds);var du=bf(dt);bK.pushMultiple(du)})}else{q(function(){var dt=w.findContentNodesWithinNode(ds);
-var du=cH(dt);bK.pushMultiple(du)})}})};this.trackContentInteraction=function(du,dv,ds,dt){if(R(cc)){return}du=a(du);dv=a(dv);ds=a(ds);dt=a(dt);if(!du||!dv){return}ds=ds||"Unknown";cm(function(){var dw=aU(du,dv,ds,dt);if(dw){bK.push(dw)}})};this.trackContentInteractionNode=function(du,dt){if(R(cc)||!du){return}var ds=null;cm(function(){ds=dj(du,dt);if(ds){bK.push(ds)}});return ds};this.logAllContentBlocksOnPage=function(){var du=w.findContentNodes();var ds=w.collectContent(du);var dt=typeof console;if(dt!=="undefined"&&console&&console.log){console.log(ds)}};this.trackEvent=function(dt,dv,ds,du,dx,dw){cm(function(){ax(dt,dv,ds,du,dx,dw)})};this.trackSiteSearch=function(ds,du,dt,dv){cg=[];cm(function(){ce(ds,du,dt,dv)})};this.setEcommerceView=function(dw,ds,du,dt){cA={};if(ac(du)){du=String(du)}if(!M(du)||du===null||du===false||!du.length){du=""}else{if(du instanceof Array){du=W.JSON.stringify(du)}}var dv="_pkc";cA[dv]=du;if(M(dt)&&dt!==null&&dt!==false&&String(dt).length){dv="_pkp";cA[dv]=dt
-}if(!ac(dw)&&!ac(ds)){return}if(ac(dw)){dv="_pks";cA[dv]=dw}if(!ac(ds)){ds=""}dv="_pkn";cA[dv]=ds};this.getEcommerceItems=function(){return JSON.parse(JSON.stringify(c9))};this.addEcommerceItem=function(dw,ds,du,dt,dv){if(ac(dw)){c9[dw]=[String(dw),ds,du,dt,dv]}};this.removeEcommerceItem=function(ds){if(ac(ds)){ds=String(ds);delete c9[ds]}};this.clearEcommerceCart=function(){c9={}};this.trackEcommerceOrder=function(ds,dw,dv,du,dt,dx){b4(ds,dw,dv,du,dt,dx)};this.trackEcommerceCartUpdate=function(ds){bz(ds)};this.trackRequest=function(dt,dv,du,ds){cm(function(){var dw=cy(dt,dv,ds);bM(dw,bQ,du)})};this.ping=function(){this.trackRequest("ping=1",null,null,"ping")};this.disableQueueRequest=function(){bK.enabled=false};this.setRequestQueueInterval=function(ds){if(ds<1000){throw new Error("Request queue interval needs to be at least 1000ms")}bK.interval=ds};this.queueRequest=function(ds){cm(function(){var dt=cy(ds);bK.push(dt)})};this.isConsentRequired=function(){return cI};this.getRememberedConsent=function(){var ds=aH(bj);
+}c0=true;var ds=W.onerror;W.onerror=function(dx,dv,du,dw,dt){cm(function(){var dy="JavaScript Errors";var dz=dv+":"+du;if(dw){dz+=":"+dw}if(P(cz,dy+dz+dx)===-1){cz.push(dy+dz+dx);ax(dy,dz,dx)}});if(ds){return ds(dx,dv,du,dw,dt)}return false}};this.disablePerformanceTracking=function(){a8=false};this.enableHeartBeatTimer=function(ds){ds=Math.max(ds||15,5);bb=ds*1000;if(c7!==null){dp()}};this.disableHeartBeatTimer=function(){if(bb||aS){if(W.removeEventListener){W.removeEventListener("focus",bg);W.removeEventListener("blur",aD);W.removeEventListener("visibilitychange",a0)}else{if(W.detachEvent){W.detachEvent("onfocus",bg);W.detachEvent("onblur",aD);W.detachEvent("visibilitychange",a0)}}}bb=null;aS=false};this.killFrame=function(){if(W.location!==W.top.location){W.top.location=W.location}};this.redirectFile=function(ds){if(W.location.protocol==="file:"){W.location=ds}};this.setCountPreRendered=function(ds){bk=ds};this.trackGoal=function(ds,dv,du,dt){cm(function(){c1(ds,dv,du,dt)})};this.trackLink=function(dt,ds,dv,du){cm(function(){da(dt,ds,dv,du)
+})};this.getNumTrackedPageViews=function(){return cx};this.trackPageView=function(ds,du,dt){cg=[];cT=[];cz=[];if(R(cc)){cm(function(){ad(aI,bO,cc)})}else{cm(function(){cx++;b6(ds,du,dt)})}};this.trackAllContentImpressions=function(){if(R(cc)){return}cm(function(){q(function(){var ds=w.findContentNodes();var dt=cH(ds);bK.pushMultiple(dt)})})};this.trackVisibleContentImpressions=function(ds,dt){if(R(cc)){return}if(!M(ds)){ds=true}if(!M(dt)){dt=750}aX(ds,dt,this);cm(function(){n(function(){var du=w.findContentNodes();var dv=bf(du);bK.pushMultiple(dv)})})};this.trackContentImpression=function(du,ds,dt){if(R(cc)){return}du=a(du);ds=a(ds);dt=a(dt);if(!du){return}ds=ds||"Unknown";cm(function(){var dv=aK(du,ds,dt);bK.push(dv)})};this.trackContentImpressionsWithinNode=function(ds){if(R(cc)||!ds){return}cm(function(){if(ck){n(function(){var dt=w.findContentNodesWithinNode(ds);var du=bf(dt);bK.pushMultiple(du)})}else{q(function(){var dt=w.findContentNodesWithinNode(ds);var du=cH(dt);bK.pushMultiple(du)
+})}})};this.trackContentInteraction=function(du,dv,ds,dt){if(R(cc)){return}du=a(du);dv=a(dv);ds=a(ds);dt=a(dt);if(!du||!dv){return}ds=ds||"Unknown";cm(function(){var dw=aU(du,dv,ds,dt);if(dw){bK.push(dw)}})};this.trackContentInteractionNode=function(du,dt){if(R(cc)||!du){return}var ds=null;cm(function(){ds=dj(du,dt);if(ds){bK.push(ds)}});return ds};this.logAllContentBlocksOnPage=function(){var du=w.findContentNodes();var ds=w.collectContent(du);var dt=typeof console;if(dt!=="undefined"&&console&&console.log){console.log(ds)}};this.trackEvent=function(dt,dv,ds,du,dx,dw){cm(function(){ax(dt,dv,ds,du,dx,dw)})};this.trackSiteSearch=function(ds,du,dt,dv){cg=[];cm(function(){ce(ds,du,dt,dv)})};this.setEcommerceView=function(dw,ds,du,dt){cA={};if(ac(du)){du=String(du)}if(!M(du)||du===null||du===false||!du.length){du=""}else{if(du instanceof Array){du=W.JSON.stringify(du)}}var dv="_pkc";cA[dv]=du;if(M(dt)&&dt!==null&&dt!==false&&String(dt).length){dv="_pkp";cA[dv]=dt}if(!ac(dw)&&!ac(ds)){return
+}if(ac(dw)){dv="_pks";cA[dv]=dw}if(!ac(ds)){ds=""}dv="_pkn";cA[dv]=ds};this.getEcommerceItems=function(){return JSON.parse(JSON.stringify(c9))};this.addEcommerceItem=function(dw,ds,du,dt,dv){if(ac(dw)){c9[dw]=[String(dw),ds,du,dt,dv]}};this.removeEcommerceItem=function(ds){if(ac(ds)){ds=String(ds);delete c9[ds]}};this.clearEcommerceCart=function(){c9={}};this.trackEcommerceOrder=function(ds,dw,dv,du,dt,dx){b4(ds,dw,dv,du,dt,dx)};this.trackEcommerceCartUpdate=function(ds){bz(ds)};this.trackRequest=function(dt,dv,du,ds){cm(function(){var dw=cy(dt,dv,ds);bM(dw,bQ,du)})};this.ping=function(){this.trackRequest("ping=1",null,null,"ping")};this.disableQueueRequest=function(){bK.enabled=false};this.setRequestQueueInterval=function(ds){if(ds<1000){throw new Error("Request queue interval needs to be at least 1000ms")}bK.interval=ds};this.queueRequest=function(ds){cm(function(){var dt=cy(ds);bK.push(dt)})};this.isConsentRequired=function(){return cI};this.getRememberedConsent=function(){var ds=aH(bj);
 if(aH(cU)){if(ds){b5(bj,bw,c6)}return null}if(!ds||ds===0){return null}return ds};this.hasRememberedConsent=function(){return !!this.getRememberedConsent()};this.requireConsent=function(){cI=true;bJ=this.hasRememberedConsent();if(!bJ){bs=true}y++;b["CoreConsent"+y]={unload:function(){if(!bJ){aJ()}}}};this.setConsentGiven=function(dt){bJ=true;b5(cU,bw,c6);var du,ds;for(du=0;du<cT.length;du++){ds=typeof cT[du];if(ds==="string"){bM(cT[du],bQ)}else{if(ds==="object"){dn(cT[du],bQ)}}}cT=[];if(!M(dt)||dt){this.setCookieConsentGiven()}};this.rememberConsentGiven=function(du){if(du){du=du*60*60*1000}else{du=30*365*24*60*60*1000}var ds=true;this.setConsentGiven(ds);var dt=new Date().getTime();dm(bj,dt,du,bw,c6,bY,aN)};this.forgetConsentGiven=function(){var ds=30*365*24*60*60*1000;b5(bj,bw,c6);dm(cU,new Date().getTime(),ds,bw,c6,bY,aN);this.forgetCookieConsentGiven();this.requireConsent()};this.isUserOptedOut=function(){return !bJ};this.optUserOut=this.forgetConsentGiven;this.forgetUserOptOut=function(){this.setConsentGiven(false)
 };n(function(){setTimeout(function(){bL=true},0)});u.trigger("TrackerSetup",[this])}function K(){return{push:aj}}function c(ay,ax){var az={};var av,aw;for(av=0;av<ax.length;av++){var at=ax[av];az[at]=1;for(aw=0;aw<ay.length;aw++){if(ay[aw]&&ay[aw][0]){var au=ay[aw][0];if(at===au){aj(ay[aw]);delete ay[aw];if(az[au]>1&&au!=="addTracker"&&au!=="enableLinkTracking"){ao("The method "+au+' 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')}az[au]++}}}}return ay}var E=["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","setPagePerformanceTiming","setExcludedQueryParams"];
 function ah(av,au){var at=new T(av,au);L.push(at);_paq=c(_paq,E);for(H=0;H<_paq.length;H++){if(_paq[H]){aj(_paq[H])}}_paq=new K();u.trigger("TrackerAdded",[at]);return at}ar(W,"beforeunload",am,false);ar(W,"online",function(){if(M(g.serviceWorker)){g.serviceWorker.ready.then(function(at){if(at&&at.sync){return at.sync.register("matomoSync")}},function(){})}},false);ar(W,"message",function(ay){if(!ay||!ay.origin){return}var aA,aw,au;var aB=d(ay.origin);var ax=u.getAsyncTrackers();for(aw=0;aw<ax.length;aw++){au=d(ax[aw].getMatomoUrl());if(au===aB){aA=ax[aw];break}}if(!aA){return}var av=null;try{av=JSON.parse(ay.data)}catch(az){return}if(!av){return}function at(aE){var aG=J.getElementsByTagName("iframe");for(aw=0;aw<aG.length;aw++){var aF=aG[aw];var aC=d(aF.src);if(aF.contentWindow&&M(aF.contentWindow.postMessage)&&aC===aB){var aD=JSON.stringify(aE);aF.contentWindow.postMessage(aD,"*")}}}if(M(av.maq_initial_value)){at({maq_opted_in:av.maq_initial_value&&aA.hasConsent(),maq_url:aA.getMatomoUrl(),maq_optout_by_default:aA.isConsentRequired()})