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:
authorStefan Giehl <stefan@matomo.org>2020-08-10 22:54:11 +0300
committerGitHub <noreply@github.com>2020-08-10 22:54:11 +0300
commit467253f17e47753a4007b4e5640fbbd5c75dc852 (patch)
tree17ec213ac000ff4e94159b3cdfaba38349dfcb64 /js
parent35d8e33bab707d9ebffd5fab5d0758cb0019c241 (diff)
Fix default value of heart beat timer (#16282)
* Fix default value of heart beart timer * rebuilt piwik.js Co-authored-by: sgiehl <sgiehl@users.noreply.github.com>
Diffstat (limited to 'js')
-rw-r--r--js/piwik.js4
-rw-r--r--js/piwik.min.js2
2 files changed, 3 insertions, 3 deletions
diff --git a/js/piwik.js b/js/piwik.js
index 309302a7a7..e7e4df7540 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -6008,8 +6008,8 @@ if (typeof window.Matomo !== 'object') {
* @param int heartBeatDelayInSeconds Defaults to 15s. Cannot be lower than 5.
*/
this.enableHeartBeatTimer = function (heartBeatDelayInSeconds) {
- heartBeatDelayInSeconds = Math.max(heartBeatDelayInSeconds, 5);
- configHeartBeatDelay = (heartBeatDelayInSeconds || 15) * 1000;
+ heartBeatDelayInSeconds = Math.max(heartBeatDelayInSeconds || 15, 5);
+ configHeartBeatDelay = heartBeatDelayInSeconds * 1000;
// if a tracking request has already been sent, start the heart beat timeout
if (lastTrackerRequestTime !== null) {
diff --git a/js/piwik.min.js b/js/piwik.min.js
index cbedf92418..7496babe70 100644
--- a/js/piwik.min.js
+++ b/js/piwik.min.js
@@ -56,7 +56,7 @@ dk<dl.length;dk++){if(G.addEventListener){G.addEventListener(dl[dk],di,false)}el
break}var dl=ck(dj);if(dl&&dl!=="/"&&dl!=="/*"){dm=true;break}}if(!dm){ay.push(cT)}};this.enableCrossDomainLinking=function(){cM=true};this.disableCrossDomainLinking=function(){cM=false};this.isCrossDomainLinkingEnabled=function(){return cM};this.setCrossDomainLinkingTimeout=function(di){aZ=di};this.getCrossDomainLinkingUrlParameter=function(){return s(av)+"="+s(bs())};this.setIgnoreClasses=function(di){bA=w(di)?[di]:di};this.setRequestMethod=function(di){c9=di||ch};this.setRequestContentType=function(di){cv=di||aI};this.setReferrerUrl=function(di){bo=di};this.setCustomUrl=function(di){a4=bV(bN,di)};this.getCurrentUrl=function(){return a4||bN};this.setDocumentTitle=function(di){bj=di};this.setAPIUrl=function(di){bI=di};this.setDownloadClasses=function(di){bL=w(di)?[di]:di};this.setLinkClasses=function(di){a8=w(di)?[di]:di};this.setCampaignNameKey=function(di){co=w(di)?[di]:di};this.setCampaignKeywordKey=function(di){bH=w(di)?[di]:di};this.discardHashTag=function(di){bP=di};this.setCookieNamePrefix=function(di){bk=di;
if(aQ){aQ=bX()}};this.setCookieDomain=function(di){var dj=L(di);if(bx(dj)){cW=dj;bi()}};this.getCookieDomain=function(){return cW};this.hasCookies=function(){return"1"===b5()};this.setSessionCookie=function(dk,dj,di){if(!dk){throw new Error("Missing cookie name")}if(!J(di)){di=cm}bv.push(dk);dd(aT(dk),dj,di,bq,cW)};this.getCookie=function(dj){var di=aD(aT(dj));if(di===0){return null}return di};this.setCookiePath=function(di){bq=di;bi()};this.getCookiePath=function(di){return bq};this.setVisitorCookieTimeout=function(di){cJ=di*1000};this.setSessionCookieTimeout=function(di){cm=di*1000};this.getSessionCookieTimeout=function(){return cm};this.setReferralCookieTimeout=function(di){c4=di*1000};this.setConversionAttributionFirstReferrer=function(di){bw=di};this.setSecureCookie=function(di){bS=di};this.disableCookies=function(){bm=true;if(b6){aF()}};this.areCookiesEnabled=function(){return !bm};this.setCookieConsentGiven=function(){if(bm&&!cP){bm=false;if(b6&&aw){aM();var di=cq("ping=1",null,"ping");
bG(di,bK)}}};this.requireCookieConsent=function(){if(this.getRememberedCookieConsent()){return false}this.disableCookies();return true};this.getRememberedCookieConsent=function(){return aD(cC)};this.forgetCookieConsentGiven=function(){bY(cC,bq,cW);this.disableCookies()};this.rememberCookieConsentGiven=function(dj){if(dj){dj=dj*60*60*1000}else{dj=30*365*24*60*60*1000}this.setCookieConsentGiven();var di=new Date().getTime();dd(cC,di,dj,bq,cW,bS)};this.deleteCookies=function(){aF()};this.setDoNotTrack=function(dj){var di=g.doNotTrack||g.msDoNotTrack;cP=dj&&(di==="yes"||di==="1");if(cP){this.disableCookies()}};this.alwaysUseSendBeacon=function(){cV=true};this.disableAlwaysUseSendBeacon=function(){cV=false};this.addListener=function(dj,di){aq(dj,di)};this.enableLinkTracking=function(dj){c8=true;var di=this;cg(function(){p(function(){bE(dj,di)});m(function(){bE(dj,di)})})};this.enableJSErrorTracking=function(){if(cR){return}cR=true;var di=S.onerror;S.onerror=function(dn,dl,dk,dm,dj){cg(function(){var dp="JavaScript Errors";
-var dq=dl+":"+dk;if(dm){dq+=":"+dm}at(dp,dq,dn)});if(di){return di(dn,dl,dk,dm,dj)}return false}};this.disablePerformanceTracking=function(){a2=false};this.setVisitStandardLength=function(di){di=Math.max(di,5);c6=di};this.enableHeartBeatTimer=function(di){di=Math.max(di,5);a5=(di||15)*1000;if(cX!==null){df()}};this.disableHeartBeatTimer=function(){if(a5||aN){if(S.removeEventListener){S.removeEventListener("focus",ba);S.removeEventListener("blur",az)}else{if(S.detachEvent){S.detachEvent("onfocus",ba);S.detachEvent("onblur",az)}}}a5=null;aN=false};this.killFrame=function(){if(S.location!==S.top.location){S.top.location=S.location}};this.redirectFile=function(di){if(S.location.protocol==="file:"){S.location=di}};this.setCountPreRendered=function(di){be=di};this.trackGoal=function(di,dl,dk,dj){cg(function(){cS(di,dl,dk,dj)})};this.trackLink=function(dj,di,dl,dk){cg(function(){c0(dj,di,dl,dk)})};this.getNumTrackedPageViews=function(){return cp};this.trackPageView=function(di,dk,dj){ca=[];cK=[];
+var dq=dl+":"+dk;if(dm){dq+=":"+dm}at(dp,dq,dn)});if(di){return di(dn,dl,dk,dm,dj)}return false}};this.disablePerformanceTracking=function(){a2=false};this.setVisitStandardLength=function(di){di=Math.max(di,5);c6=di};this.enableHeartBeatTimer=function(di){di=Math.max(di||15,5);a5=di*1000;if(cX!==null){df()}};this.disableHeartBeatTimer=function(){if(a5||aN){if(S.removeEventListener){S.removeEventListener("focus",ba);S.removeEventListener("blur",az)}else{if(S.detachEvent){S.detachEvent("onfocus",ba);S.detachEvent("onblur",az)}}}a5=null;aN=false};this.killFrame=function(){if(S.location!==S.top.location){S.top.location=S.location}};this.redirectFile=function(di){if(S.location.protocol==="file:"){S.location=di}};this.setCountPreRendered=function(di){be=di};this.trackGoal=function(di,dl,dk,dj){cg(function(){cS(di,dl,dk,dj)})};this.trackLink=function(dj,di,dl,dk){cg(function(){c0(dj,di,dl,dk)})};this.getNumTrackedPageViews=function(){return cp};this.trackPageView=function(di,dk,dj){ca=[];cK=[];
if(N(b6)){cg(function(){Z(aE,bI,b6)})}else{cg(function(){cp++;b0(di,dk,dj)})}};this.trackAllContentImpressions=function(){if(N(b6)){return}cg(function(){p(function(){var di=v.findContentNodes();var dj=cy(di);bD.pushMultiple(dj)})})};this.trackVisibleContentImpressions=function(di,dj){if(N(b6)){return}if(!J(di)){di=true}if(!J(dj)){dj=750}aS(di,dj,this);cg(function(){m(function(){var dk=v.findContentNodes();var dl=a9(dk);bD.pushMultiple(dl)})})};this.trackContentImpression=function(dk,di,dj){if(N(b6)){return}dk=a(dk);di=a(di);dj=a(dj);if(!dk){return}di=di||"Unknown";cg(function(){var dl=aG(dk,di,dj);bD.push(dl)})};this.trackContentImpressionsWithinNode=function(di){if(N(b6)||!di){return}cg(function(){if(ce){m(function(){var dj=v.findContentNodesWithinNode(di);var dk=a9(dj);bD.pushMultiple(dk)})}else{p(function(){var dj=v.findContentNodesWithinNode(di);var dk=cy(dj);bD.pushMultiple(dk)})}})};this.trackContentInteraction=function(dk,dl,di,dj){if(N(b6)){return}dk=a(dk);dl=a(dl);di=a(di);dj=a(dj);
if(!dk||!dl){return}di=di||"Unknown";cg(function(){var dm=aP(dk,dl,di,dj);if(dm){bD.push(dm)}})};this.trackContentInteractionNode=function(dk,dj){if(N(b6)||!dk){return}var di=null;cg(function(){di=da(dk,dj);if(di){bD.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){cg(function(){at(dj,dl,di,dk,dn,dm)})};this.trackSiteSearch=function(di,dk,dj,dl){ca=[];cg(function(){b8(di,dk,dj,dl)})};this.setEcommerceView=function(dm,di,dk,dj){cr={};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";cr[dl]=dk;if(J(dj)&&dj!==null&&dj!==false&&String(dj).length){dl="_pkp";cr[dl]=dj}if(!Y(dm)&&!Y(di)){return}if(Y(dm)){dl="_pks";cr[dl]=dm}if(!Y(di)){di=""}dl="_pkn";cr[dl]=di};this.getEcommerceItems=function(){return JSON.parse(JSON.stringify(cZ))
};this.addEcommerceItem=function(dm,di,dk,dj,dl){if(Y(dm)){cZ[dm]=[String(dm),di,dk,dj,dl]}};this.removeEcommerceItem=function(di){if(Y(di)){di=String(di);delete cZ[di]}};this.clearEcommerceCart=function(){cZ={}};this.trackEcommerceOrder=function(di,dm,dl,dk,dj,dn){bZ(di,dm,dl,dk,dj,dn)};this.trackEcommerceCartUpdate=function(di){bt(di)};this.trackRequest=function(dj,dl,dk,di){cg(function(){var dm=cq(dj,dl,di);bG(dm,bK,dk)})};this.ping=function(){this.trackRequest("ping=1",null,null,"ping")};this.disableQueueRequest=function(){bD.enabled=false};this.setRequestQueueInterval=function(di){if(di<1000){throw new Error("Request queue interval needs to be at least 1000ms")}bD.interval=di};this.queueRequest=function(di){cg(function(){var dj=cq(di);bD.push(dj)})};this.isConsentRequired=function(){return cz};this.getRememberedConsent=function(){var di=aD(bd);if(aD(cL)){if(di){bY(bd,bq,cW)}return null}if(!di||di===0){return null}return di};this.hasRememberedConsent=function(){return !!this.getRememberedConsent()