support callback in JS tracker method trackGoal (#13680)

1 files changed, 2 insertions, 2 deletions

diff --git a/piwik.js b/piwik.js
index d954114f2d..ab31c2e309 100644
--- a/piwik.js
+++ b/piwik.js
@@ -54,7 +54,7 @@ var db=da.hostname||d(da.href);var dc=db.toLowerCase();var c7=da.href.replace(db
 }return v.buildInteractionRequestParams(c6,c8.name,c8.piece,c8.target)}function aP(c6){if(!b1||!b1.length){return false}var c5,c7;for(c5=0;c5<b1.length;c5++){c7=b1[c5];if(c7&&c7.name===c6.name&&c7.piece===c6.piece&&c7.target===c6.target){return true}}return false}function bv(c8){if(!c8){return false}var db=v.findTargetNode(c8);if(!db||v.shouldIgnoreInteraction(db)){return false}var dc=cZ(db);if(cW&&dc&&dc.type){return false}if(ab.isLinkElement(db)&&ab.hasNodeAttributeWithValue(db,"href")){var c5=String(ab.getAttributeValueFromNode(db,"href"));if(0===c5.indexOf("#")){return false}if(aN(c5)){return true}if(!v.isUrlToCurrentDomain(c5)){return false}var c9=v.buildContentBlock(c8);if(!c9){return}var c7=c9.name;var dd=c9.piece;var da=c9.target;if(!ab.hasNodeAttributeWithValue(db,v.CONTENT_TARGET_ATTR)||db.wasContentTargetAttrReplaced){db.wasContentTargetAttrReplaced=true;da=v.toAbsoluteUrl(c5);ab.setAnyAttribute(db,v.CONTENT_TARGET_ATTR,da)}var c6=cB(c5,"click",c7,dd,da);v.setHrefAttribute(db,c6);
 return true}return false}function aG(c6){if(!c6||!c6.length){return}var c5;for(c5=0;c5<c6.length;c5++){bv(c6[c5])}}function aQ(c5){return function(c6){if(!c5){return}var c9=v.findParentContentNode(c5);var da;if(c6){da=c6.target||c6.srcElement}if(!da){da=c5}if(!a4(c9,da)){return}b7(bA);if(ab.isLinkElement(c5)&&ab.hasNodeAttributeWithValue(c5,"href")&&ab.hasNodeAttributeWithValue(c5,v.CONTENT_TARGET_ATTR)){var c7=ab.getAttributeValueFromNode(c5,"href");if(!aN(c7)&&c5.wasContentTargetAttrReplaced){ab.setAnyAttribute(c5,v.CONTENT_TARGET_ATTR,"")}}var de=cZ(c5);if(al&&de&&de.type){return de.type}if(bv(c9)){return"href"}var db=v.buildContentBlock(c9);if(!db){return}var c8=db.name;var df=db.piece;var dd=db.target;var dc=aI("click",c8,df,dd);bw(dc,bA);return dc}}function bS(c7){if(!c7||!c7.length){return}var c5,c6;for(c5=0;c5<c7.length;c5++){c6=v.findTargetNode(c7[c5]);if(c6&&!c6.contentInteractionTrackingSetupDone){c6.contentInteractionTrackingSetupDone=true;aj(c6,"click",aQ(c6))}}}function bp(c7,c8){if(!c7||!c7.length){return[]
 }var c5,c6;for(c5=0;c5<c7.length;c5++){if(aP(c7[c5])){c7.splice(c5,1);c5--}else{b1.push(c7[c5])}}if(!c7||!c7.length){return[]}aG(c8);bS(c8);var c9=[];for(c5=0;c5<c7.length;c5++){c6=ck(v.buildImpressionRequestParams(c7[c5].name,c7[c5].piece,c7[c5].target),undefined,"contentImpressions");if(c6){c9.push(c6)}}return c9}function cq(c6){var c5=v.collectContent(c6);return bp(c5,c6)}function a2(c6){if(!c6||!c6.length){return[]}var c5;for(c5=0;c5<c6.length;c5++){if(!v.isNodeVisible(c6[c5])){c6.splice(c5,1);c5--}}if(!c6||!c6.length){return[]}return cq(c6)}function aA(c7,c5,c6){var c8=v.buildImpressionRequestParams(c7,c5,c6);return ck(c8,null,"contentImpression")}function cY(c8,c6){if(!c8){return}var c5=v.findParentContentNode(c8);var c7=v.buildContentBlock(c5);if(!c7){return}if(!c6){c6="Unknown"}return aI(c6,c7.name,c7.piece,c7.target)}function cF(c6,c8,c5,c7){return"e_c="+t(c6)+"&e_a="+t(c8)+(J(c5)?"&e_n="+t(c5):"")+(J(c7)?"&e_v="+t(c7):"")}function ao(c7,c9,c5,c8,db,da){if(a(String(c7)).length===0||a(String(c9)).length===0){ag("Error while logging event: Parameters `category` and `action` must not be empty or filled with whitespaces");
-return false}var c6=ck(cF(c7,c9,c5,c8),db,"event");bw(c6,bA,da)}function bZ(c5,c8,c6,c9){var c7=ck("search="+t(c5)+(c8?"&search_cat="+t(c8):"")+(J(c6)?"&search_count="+c6:""),c9,"sitesearch");bw(c7,bA)}function cJ(c5,c8,c7){var c6=ck("idgoal="+c5+(c8?"&revenue="+c8:""),c7,"goal");bw(c6,bA)}function cQ(c8,c5,dc,db,c7){var da=c5+"="+t(bT(c8));var c6=cm(c7,"click",c8);if(c6){da+="&"+c6}var c9=ck(da,dc,"link");bw(c9,bA,db)}function bL(c6,c5){if(c6!==""){return c6+c5.charAt(0).toUpperCase()+c5.slice(1)}return c5}function b8(da){var c9,c5,c8=["","webkit","ms","moz"],c7;if(!a7){for(c5=0;c5<c8.length;c5++){c7=c8[c5];if(Object.prototype.hasOwnProperty.call(G,bL(c7,"hidden"))){if(G[bL(c7,"visibilityState")]==="prerender"){c9=true}break}}}if(c9){aj(G,c7+"visibilitychange",function c6(){G.removeEventListener(c7+"visibilitychange",c6,false);da()});return}da()}function bj(){var c6=aR().uuid;var c5=aD();return c6+c5}function ca(c5){if(!c5){return}if(!ab.hasNodeAttribute(c5,"href")){return}var c6=ab.getAttributeValueFromNode(c5,"href");
+return false}var c6=ck(cF(c7,c9,c5,c8),db,"event");bw(c6,bA,da)}function bZ(c5,c8,c6,c9){var c7=ck("search="+t(c5)+(c8?"&search_cat="+t(c8):"")+(J(c6)?"&search_count="+c6:""),c9,"sitesearch");bw(c7,bA)}function cJ(c5,c9,c8,c7){var c6=ck("idgoal="+c5+(c9?"&revenue="+c9:""),c8,"goal");bw(c6,bA,c7)}function cQ(c8,c5,dc,db,c7){var da=c5+"="+t(bT(c8));var c6=cm(c7,"click",c8);if(c6){da+="&"+c6}var c9=ck(da,dc,"link");bw(c9,bA,db)}function bL(c6,c5){if(c6!==""){return c6+c5.charAt(0).toUpperCase()+c5.slice(1)}return c5}function b8(da){var c9,c5,c8=["","webkit","ms","moz"],c7;if(!a7){for(c5=0;c5<c8.length;c5++){c7=c8[c5];if(Object.prototype.hasOwnProperty.call(G,bL(c7,"hidden"))){if(G[bL(c7,"visibilityState")]==="prerender"){c9=true}break}}}if(c9){aj(G,c7+"visibilitychange",function c6(){G.removeEventListener(c7+"visibilitychange",c6,false);da()});return}da()}function bj(){var c6=aR().uuid;var c5=aD();return c6+c5}function ca(c5){if(!c5){return}if(!ab.hasNodeAttribute(c5,"href")){return}var c6=ab.getAttributeValueFromNode(c5,"href");
 if(!c6||aN(c6)){return}c6=k(c6,aq);if(c6.indexOf("?")>0){c6+="&"}else{c6+="?"}var c7=bj();c6=F(c6,aq,c7);ab.setAnyAttribute(c5,"href",c6)}function av(c8){var c9=ab.getAttributeValueFromNode(c8,"href");if(!c9){return false}c9=String(c9);var c6=c9.indexOf("//")===0||c9.indexOf("http://")===0||c9.indexOf("https://")===0;if(!c6){return false}var c5=c8.pathname||cc(c8.href);var c7=(c8.hostname||d(c8.href)).toLowerCase();if(an(c7,c5)){if(!cx(cK,L(c7))){return true}return false}return false}function cw(c5){var c6=cZ(c5);if(c6&&c6.type){c6.href=p(c6.href);cQ(c6.href,c6.type,undefined,null,c5);return}if(cD){c5=ap(c5);if(av(c5)){ca(c5)}}}function cn(){return G.all&&!G.addEventListener}function cL(c5){var c7=c5.which;var c6=(typeof c5.button);if(!c7&&c6!=="undefined"){if(cn()){if(c5.button&1){c7=1}else{if(c5.button&2){c7=3}else{if(c5.button&4){c7=2}}}}else{if(c5.button===0||c5.button==="0"){c7=1}else{if(c5.button&1){c7=2}else{if(c5.button&2){c7=3}}}}}return c7}function bK(c5){switch(cL(c5)){case 1:return"left";
 case 2:return"middle";case 3:return"right"}}function aU(c5){return c5.target||c5.srcElement}function aw(c5){return function(c8){c8=c8||T.event;var c7=bK(c8);var c9=aU(c8);if(c8.type==="click"){var c6=false;if(c5&&c7==="middle"){c6=true}if(c9&&!c6){cw(c9)}}else{if(c8.type==="mousedown"){if(c7==="middle"&&c9){aK=c7;bs=c9}else{aK=bs=null}}else{if(c8.type==="mouseup"){if(c7===aK&&c9===bs){cw(c9)}aK=bs=null}else{if(c8.type==="contextmenu"){cw(c9)}}}}}}function am(c7,c6){var c5=typeof c6;if(c5==="undefined"){c6=true}aj(c7,"click",aw(c6),false);if(c6){aj(c7,"mouseup",aw(c6),false);aj(c7,"mousedown",aw(c6),false);aj(c7,"contextmenu",aw(c6),false)}}function bu(c7,c9){al=true;var c8,c6=aT(br,"ignore"),da=G.links,c5=null,db=null;if(da){for(c8=0;c8<da.length;c8++){c5=da[c8];if(!c6.test(c5.className)){db=typeof c5.piwikTrackers;if("undefined"===db){c5.piwikTrackers=[]}if(-1===M(c5.piwikTrackers,c9)){c5.piwikTrackers.push(c9);am(c5,c7)}}}}}function aL(c6,c9,da){if(b6){return true}b6=true;var db=false;
 var c8,c7;function c5(){db=true}n(function(){function dc(de){setTimeout(function(){if(!b6){return}db=false;da.trackVisibleContentImpressions();dc(de)},de)}function dd(de){setTimeout(function(){if(!b6){return}if(db){db=false;da.trackVisibleContentImpressions()}dd(de)},de)}if(c6){c8=["scroll","resize"];for(c7=0;c7<c8.length;c7++){if(G.addEventListener){G.addEventListener(c8[c7],c5,false)}else{T.attachEvent("on"+c8[c7],c5)}}dd(100)}if(c9&&c9>0){c9=parseInt(c9,10);dc(c9)}})}function cv(){var c6,c8,c9={pdf:"application/pdf",qt:"video/quicktime",realp:"audio/x-pn-realaudio-plugin",wma:"application/x-mplayer2",dir:"application/x-director",fla:"application/x-shockwave-flash",java:"application/x-java-vm",gears:"application/x-googlegears",ag:"application/x-silverlight"};if(!((new RegExp("MSIE")).test(h.userAgent))){if(h.mimeTypes&&h.mimeTypes.length){for(c6 in c9){if(Object.prototype.hasOwnProperty.call(c9,c6)){c8=h.mimeTypes[c9[c6]];cV[c6]=(c8&&c8.enabledPlugin)?"1":"0"}}}if(!((new RegExp("Edge[ /](\\d+[\\.\\d]+)")).test(h.userAgent))&&typeof navigator.javaEnabled!=="unknown"&&J(h.javaEnabled)&&h.javaEnabled()){cV.java="1"
@@ -64,7 +64,7 @@ if(!J(c7)){c7="visit"}if(c7==="page"||c7===3){c5=bN[c6]}else{if(c7==="event"){c5
 for(c7;c7<ar.length;c7++){c6=String(ar[c7]);if(cx(cK,L(c6))){c9=true;break}var c8=cc(c6);if(c8&&c8!=="/"&&c8!=="/*"){c9=true;break}}if(!c9){ar.push(cK)}};this.enableCrossDomainLinking=function(){cD=true};this.disableCrossDomainLinking=function(){cD=false};this.isCrossDomainLinkingEnabled=function(){return cD};this.setCrossDomainLinkingTimeout=function(c5){aS=c5};this.getCrossDomainLinkingUrlParameter=function(){return t(aq)+"="+t(bj())};this.setIgnoreClasses=function(c5){br=w(c5)?[c5]:c5};this.setRequestMethod=function(c5){cX=c5||b9};this.setRequestContentType=function(c5){co=c5||aC};this.setReferrerUrl=function(c5){bf=c5};this.setCustomUrl=function(c5){aX=bM(bE,c5)};this.getCurrentUrl=function(){return aX||bE};this.setDocumentTitle=function(c5){bb=c5};this.setAPIUrl=function(c5){by=c5};this.setDownloadClasses=function(c5){bC=w(c5)?[c5]:c5};this.setLinkClasses=function(c5){a1=w(c5)?[c5]:c5};this.setCampaignNameKey=function(c5){ci=w(c5)?[c5]:c5};this.setCampaignKeywordKey=function(c5){bx=w(c5)?[c5]:c5
 };this.discardHashTag=function(c5){bG=c5};this.setCookieNamePrefix=function(c5){bc=c5;aJ=bO()};this.setCookieDomain=function(c5){var c6=L(c5);if(bo(c6)){cM=c6;ba()}};this.getCookieDomain=function(){return cM};this.hasCookies=function(){return"1"===bW()};this.setSessionCookie=function(c7,c6,c5){if(!c7){throw new Error("Missing cookie name")}if(!J(c5)){c5=cg}bm.push(c7);c0(aM(c7),c6,c5,bh,cM)};this.getCookie=function(c6){var c5=ax(aM(c6));if(c5===0){return null}return c5};this.setCookiePath=function(c5){bh=c5;ba()};this.getCookiePath=function(c5){return bh};this.setVisitorCookieTimeout=function(c5){cz=c5*1000};this.setSessionCookieTimeout=function(c5){cg=c5*1000};this.getSessionCookieTimeout=function(){return cg};this.setReferralCookieTimeout=function(c5){cT=c5*1000};this.setConversionAttributionFirstReferrer=function(c5){bn=c5};this.setSecureCookie=function(c5){bJ=c5};this.disableCookies=function(){bd=true;cV.cookie="0";if(bX){az()}};this.deleteCookies=function(){az()};this.setDoNotTrack=function(c6){var c5=h.doNotTrack||h.msDoNotTrack;
 cG=c6&&(c5==="yes"||c5==="1");if(cG){this.disableCookies()}};this.addListener=function(c6,c5){am(c6,c5)};this.enableLinkTracking=function(c6){cW=true;var c5=this;b8(function(){q(function(){bu(c6,c5)})})};this.enableJSErrorTracking=function(){if(cI){return}cI=true;var c5=T.onerror;T.onerror=function(da,c8,c7,c9,c6){b8(function(){var db="JavaScript Errors";var dc=c8+":"+c7;if(c9){dc+=":"+c9}ao(db,dc,da)});if(c5){return c5(da,c8,c7,c9,c6)}return false}};this.disablePerformanceTracking=function(){aV=false};this.setGenerationTimeMs=function(c5){ce=parseInt(c5,10)};this.enableHeartBeatTimer=function(c5){c5=Math.max(c5,1);aY=(c5||15)*1000;if(cN!==null){c2()}};this.disableHeartBeatTimer=function(){bB();if(aY||aH){if(T.removeEventListener){T.removeEventListener("focus",a3,true);T.removeEventListener("blur",at,true)}else{if(T.detachEvent){T.detachEvent("onfocus",a3);T.detachEvent("onblur",at)}}}aY=null;aH=false};this.killFrame=function(){if(T.location!==T.top.location){T.top.location=T.location}};
-this.redirectFile=function(c5){if(T.location.protocol==="file:"){T.location=c5}};this.setCountPreRendered=function(c5){a7=c5};this.trackGoal=function(c5,c7,c6){b8(function(){cJ(c5,c7,c6)})};this.trackLink=function(c6,c5,c8,c7){b8(function(){cQ(c6,c5,c8,c7)})};this.getNumTrackedPageViews=function(){return cj};this.trackPageView=function(c5,c7,c6){b1=[];cA=[];if(N(bX)){b8(function(){X(ay,by,bX)})}else{b8(function(){cj++;bR(c5,c7,c6)})}};this.trackAllContentImpressions=function(){if(N(bX)){return}b8(function(){q(function(){var c5=v.findContentNodes();var c6=cq(c5);c1(c6,bA)})})};this.trackVisibleContentImpressions=function(c5,c6){if(N(bX)){return}if(!J(c5)){c5=true}if(!J(c6)){c6=750}aL(c5,c6,this);b8(function(){n(function(){var c7=v.findContentNodes();var c8=a2(c7);c1(c8,bA)})})};this.trackContentImpression=function(c7,c5,c6){if(N(bX)){return}c7=a(c7);c5=a(c5);c6=a(c6);if(!c7){return}c5=c5||"Unknown";b8(function(){var c8=aA(c7,c5,c6);bw(c8,bA)})};this.trackContentImpressionsWithinNode=function(c5){if(N(bX)||!c5){return
+this.redirectFile=function(c5){if(T.location.protocol==="file:"){T.location=c5}};this.setCountPreRendered=function(c5){a7=c5};this.trackGoal=function(c5,c8,c7,c6){b8(function(){cJ(c5,c8,c7,c6)})};this.trackLink=function(c6,c5,c8,c7){b8(function(){cQ(c6,c5,c8,c7)})};this.getNumTrackedPageViews=function(){return cj};this.trackPageView=function(c5,c7,c6){b1=[];cA=[];if(N(bX)){b8(function(){X(ay,by,bX)})}else{b8(function(){cj++;bR(c5,c7,c6)})}};this.trackAllContentImpressions=function(){if(N(bX)){return}b8(function(){q(function(){var c5=v.findContentNodes();var c6=cq(c5);c1(c6,bA)})})};this.trackVisibleContentImpressions=function(c5,c6){if(N(bX)){return}if(!J(c5)){c5=true}if(!J(c6)){c6=750}aL(c5,c6,this);b8(function(){n(function(){var c7=v.findContentNodes();var c8=a2(c7);c1(c8,bA)})})};this.trackContentImpression=function(c7,c5,c6){if(N(bX)){return}c7=a(c7);c5=a(c5);c6=a(c6);if(!c7){return}c5=c5||"Unknown";b8(function(){var c8=aA(c7,c5,c6);bw(c8,bA)})};this.trackContentImpressionsWithinNode=function(c5){if(N(bX)||!c5){return
 }b8(function(){if(b6){n(function(){var c6=v.findContentNodesWithinNode(c5);var c7=a2(c6);c1(c7,bA)})}else{q(function(){var c6=v.findContentNodesWithinNode(c5);var c7=cq(c6);c1(c7,bA)})}})};this.trackContentInteraction=function(c7,c8,c5,c6){if(N(bX)){return}c7=a(c7);c8=a(c8);c5=a(c5);c6=a(c6);if(!c7||!c8){return}c5=c5||"Unknown";b8(function(){var c9=aI(c7,c8,c5,c6);bw(c9,bA)})};this.trackContentInteractionNode=function(c6,c5){if(N(bX)||!c6){return}b8(function(){var c7=cY(c6,c5);bw(c7,bA)})};this.logAllContentBlocksOnPage=function(){var c7=v.findContentNodes();var c5=v.collectContent(c7);var c6=typeof console;if(c6!=="undefined"&&console&&console.log){console.log(c5)}};this.trackEvent=function(c6,c8,c5,c7,da,c9){b8(function(){ao(c6,c8,c5,c7,da,c9)})};this.trackSiteSearch=function(c5,c7,c6,c8){b8(function(){bZ(c5,c7,c6,c8)})};this.setEcommerceView=function(c8,c5,c7,c6){if(!J(c7)||!c7.length){c7=""}else{if(c7 instanceof Array){c7=JSON_PIWIK.stringify(c7)}}bN[5]=["_pkc",c7];if(J(c6)&&String(c6).length){bN[2]=["_pkp",c6]
 }if((!J(c8)||!c8.length)&&(!J(c5)||!c5.length)){return}if(J(c8)&&c8.length){bN[3]=["_pks",c8]}if(!J(c5)||!c5.length){c5=""}bN[4]=["_pkn",c5]};this.addEcommerceItem=function(c9,c5,c7,c6,c8){if(c9.length){cP[c9]=[c9,c5,c7,c6,c8]}};this.removeEcommerceItem=function(c5){if(c5.length){delete cP[c5]}};this.clearEcommerceCart=function(){cP={}};this.trackEcommerceOrder=function(c5,c9,c8,c7,c6,da){bQ(c5,c9,c8,c7,c6,da)};this.trackEcommerceCartUpdate=function(c5){bk(c5)};this.trackRequest=function(c6,c8,c7,c5){b8(function(){var c9=ck(c6,c8,c5);bw(c9,bA,c7)})};this.getRememberedConsent=function(){var c5=ax(a6);if(ax(cC)){if(c5){bP(a6,bh,cM)}return null}if(!c5||c5===0){return null}return c5};this.hasRememberedConsent=function(){return !!this.getRememberedConsent()};this.requireConsent=function(){cr=true;bt=this.hasRememberedConsent();x++;b["CoreConsent"+x]={unload:function(){if(!bt){az()}}}};this.setConsentGiven=function(){bt=true;bP(cC,bh,cM);var c6,c5;for(c6=0;c6<cA.length;c6++){c5=typeof cA[c6];
 if(c5==="string"){bw(cA[c6],bA)}else{if(c5==="object"){c1(cA[c6],bA)}}}cA=[]};this.rememberConsentGiven=function(c6){if(bd){ag("rememberConsentGiven is called but cookies are disabled, consent will not be remembered");return}if(c6){c6=c6*60*60*1000}this.setConsentGiven();var c5=new Date().getTime();c0(a6,c5,c6,bh,cM,bJ)};this.forgetConsentGiven=function(){if(bd){ag("forgetConsentGiven is called but cookies are disabled, consent will not be forgotten");return}bP(a6,bh,cM);c0(cC,new Date().getTime(),0,bh,cM,bJ);this.requireConsent()};this.isUserOptedOut=function(){return !bt};this.optUserOut=this.forgetConsentGiven;this.forgetUserOptOut=this.rememberConsentGiven;e.trigger("TrackerSetup",[this])}function H(){return{push:ac}}function c(ap,ao){var aq={};var am,an;for(am=0;am<ao.length;am++){var ak=ao[am];aq[ak]=1;for(an=0;an<ap.length;an++){if(ap[an]&&ap[an][0]){var al=ap[an][0];if(ak===al){ac(ap[an]);delete ap[an];if(aq[al]>1&&al!=="addTracker"){ag("The method "+al+' is registered more than once in "_paq" variable. Only the last call has an effect. Please have a look at the multiple Piwik trackers documentation: https://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')