Fixes #4856 Make sure setAPIUrl, when called, is executed before any other request is sent.

1 files changed, 2 insertions, 2 deletions

diff --git a/piwik.js b/piwik.js
index c873e507c0..2fac454f33 100644
--- a/piwik.js
+++ b/piwik.js
@@ -18,7 +18,7 @@ break;case 3:ah=ae.charCodeAt(O-3)<<24|ae.charCodeAt(O-2)<<16|ae.charCodeAt(O-1)
 function a2(bv,bs,br,bu,bq,bt){if(ac){return}var bp;if(br){bp=new Date();bp.setTime(bp.getTime()+br)}q.cookie=bv+"="+j(bs)+(br?";expires="+bp.toGMTString():"")+";path="+(bu||"/")+(bq?";domain="+bq:"")+(bt?";secure":"")}function ah(br){if(ac){return 0}var bp=new RegExp("(^|;)[ ]*"+br+"=([^;]*)"),bq=bp.exec(q.cookie);return bq?z(bq[2]):0}function bh(bp){var bq;if(Z){bq=new RegExp("#.*");return bp.replace(bq,"")}return bp}function a6(br,bp){var bs=i(bp),bq;if(bs){return bp}if(bp.slice(0,1)==="/"){return i(br)+"://"+b(br)+bp}br=bh(br);bq=br.indexOf("?");if(bq>=0){br=br.slice(0,bq)}bq=br.lastIndexOf("/");if(bq!==br.length-1){br=br.slice(0,bq+1)}return br+bp}function aR(bs){var bq,bp,br;for(bq=0;bq<aQ.length;bq++){bp=u(aQ[bq].toLowerCase());if(bs===bp){return true}if(bp.slice(0,1)==="."){if(bs===bp.slice(1)){return true}br=bs.length-bp.length;if((br>0)&&(bs.slice(br)===bp)){return true}}}return false}function bo(bp){var bq=new Image(1,1);bq.onload=function(){p=0};bq.src=S+(S.indexOf("?")<0?"?":"&")+bp
 }function a3(bp){try{var br=A.XMLHttpRequest?new A.XMLHttpRequest():A.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):null;br.open("POST",S,true);br.onreadystatechange=function(){if(this.readyState===4&&this.status!==200){bo(bp)}};br.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");br.send(bp)}catch(bq){bo(bp)}}function az(br,bq){var bp=new Date();if(!bf){if(aS==="POST"){a3(br)}else{bo(br)}h=bp.getTime()+bq}}function a1(bp){return bk+bp+"."+bc+"."+aW}function V(){if(ac){return"0"}if(!s(d.cookieEnabled)){var bp=a1("testcookie");a2(bp,"1");return ah(bp)==="1"?"1":"0"}return d.cookieEnabled?"1":"0"}function aL(){aW=ax((ae||a7)+(bl||"/")).slice(0,4)}function ag(){var bq=a1("cvar"),bp=ah(bq);if(bp.length){bp=JSON2.parse(bp);if(C(bp)){return bp}}return{}}function R(){if(W===false){W=ag()}}function bb(){var bp=new Date();aT=bp.getTime()}function ad(bt,bq,bp,bs,br,bu){a2(a1("id"),bt+"."+bq+"."+bp+"."+bs+"."+br+"."+bu,ai,bl,ae)}function Q(){var bq=new Date(),bp=Math.round(bq.getTime()/1000),bs=ah(a1("id")),br;
 if(bs){br=bs.split(".");br.unshift("0")}else{if(!aC){aC=ax((d.userAgent||"")+(d.platform||"")+JSON2.stringify(bd)+bq.getTime()+Math.random()).slice(0,16)}br=["1",aC,bp,0,bp,"",""]}return br}function O(){var bp=ah(a1("ref"));if(bp.length){try{bp=JSON2.parse(bp);if(C(bp)){return bp}}catch(bq){}}return["","",0,""]}function P(){var bp=ac;ac=false;a2(a1("id"),"",-86400,bl,ae);a2(a1("ses"),"",-86400,bl,ae);a2(a1("cvar"),"",-86400,bl,ae);a2(a1("ref"),"",-86400,bl,ae);ac=bp}function ba(bt){if(!bt||!C(bt)){return}var bs=[];var br;for(br in bt){if(Object.prototype.hasOwnProperty.call(bt,br)){bs.push(br)}}var bu={};bs.sort();var bp=bs.length;var bq;for(bq=0;bq<bp;bq++){bu[bs[bq]]=bt[bs[bq]]}return bu}function av(br,bP,bQ,bs){var bN,bq=new Date(),bz=Math.round(bq.getTime()/1000),bT,bO,bu,bF,bK,by,bI,bv,bM,bt=1024,bV,bC,bJ=W,bA=a1("ses"),bB=a1("ref"),bW=a1("cvar"),bG=Q(),bE=ah(bA),bL=O(),bS=aE||bm,bw,bp;if(ac){P()}if(bf){return""}bT=bG[0];bO=bG[1];bF=bG[2];bu=bG[3];bK=bG[4];by=bG[5];if(!s(bG[6])){bG[6]=""
-}bI=bG[6];if(!s(bs)){bs=""}var bD=q.characterSet||q.charset;if(!bD||bD.toLowerCase()==="utf-8"){bD=null}bw=bL[0];bp=bL[1];bv=bL[2];bM=bL[3];if(!bE){var bR=ak/1000;if(!by||(bz-by)>bR){bu++;by=bK}if(!aD||!bw.length){for(bN in ay){if(Object.prototype.hasOwnProperty.call(ay,bN)){bw=B(bS,ay[bN]);if(bw.length){break}}}for(bN in at){if(Object.prototype.hasOwnProperty.call(at,bN)){bp=B(bS,at[bN]);if(bp.length){break}}}}bV=b(aU);bC=bM.length?b(bM):"";if(bV.length&&!aR(bV)&&(!aD||!bC.length||aR(bC))){bM=aU}if(bM.length||bw.length){bv=bz;bL=[bw,bp,bv,bh(bM.slice(0,bt))];a2(bB,JSON2.stringify(bL),aF,bl,ae)}}br+="&idsite="+bc+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+bq.getHours()+"&m="+bq.getMinutes()+"&s="+bq.getSeconds()+"&url="+j(bh(bS))+(aU.length?"&urlref="+j(bh(aU)):"")+"&_id="+bO+"&_idts="+bF+"&_idvc="+bu+"&_idn="+bT+(bw.length?"&_rcn="+j(bw):"")+(bp.length?"&_rck="+j(bp):"")+"&_refts="+bv+"&_viewts="+by+(String(bI).length?"&_ects="+bI:"")+(String(bM).length?"&_ref="+j(bh(bM.slice(0,bt))):"")+(bD?"&cs="+j(bD):"");
+}bI=bG[6];if(!s(bs)){bs=""}var bD=q.characterSet||q.charset;if(!bD||bD.toLowerCase()==="utf-8"){bD=null}bw=bL[0];bp=bL[1];bv=bL[2];bM=bL[3];if(!bE){var bR=ak/1000;if(!by||(bz-by)>bR){bu++;by=bK}if(!aD||!bw.length){for(bN in ay){if(Object.prototype.hasOwnProperty.call(ay,bN)){bw=B(bS,ay[bN]);if(bw.length){break}}}for(bN in at){if(Object.prototype.hasOwnProperty.call(at,bN)){bp=B(bS,at[bN]);if(bp.length){break}}}}bV=b(aU);bC=bM.length?b(bM):"";if(bV.length&&!aR(bV)&&(!aD||!bC.length||aR(bC))){bM=aU}if(bM.length||bw.length){bv=bz;bL=[bw,bp,bv,bh(bM.slice(0,bt))];a2(bB,JSON2.stringify(bL),aF,bl,ae)}}br+="&idsite="+bc+"&rec=1&h="+bq.getHours()+"&m="+bq.getMinutes()+"&s="+bq.getSeconds()+"&url="+j(bh(bS))+(aU.length?"&urlref="+j(bh(aU)):"")+"&_id="+bO+"&_idts="+bF+"&_idvc="+bu+"&_idn="+bT+(bw.length?"&_rcn="+j(bw):"")+(bp.length?"&_rck="+j(bp):"")+"&_refts="+bv+"&_viewts="+by+(String(bI).length?"&_ects="+bI:"")+(String(bM).length?"&_ref="+j(bh(bM.slice(0,bt))):"")+(bD?"&cs="+j(bD):"")+"&r="+String(Math.random()).slice(2,8);
 for(bN in bd){if(Object.prototype.hasOwnProperty.call(bd,bN)){br+="&"+bN+"="+bd[bN]}}if(bP){br+="&data="+j(JSON2.stringify(bP))}else{if(ab){br+="&data="+j(JSON2.stringify(ab))}}function bx(bX,bY){var bZ=JSON2.stringify(bX);if(bZ.length>2){return"&"+bY+"="+j(bZ)}return""}var bU=ba(aJ);var bH=ba(T);br+=bx(bU,"cvar");br+=bx(bH,"e_cvar");if(W){br+=bx(W,"_cvar");for(bN in bJ){if(Object.prototype.hasOwnProperty.call(bJ,bN)){if(W[bN][0]===""||W[bN][1]===""){delete W[bN]}}}a2(bW,JSON2.stringify(W),ak,bl,ae)}if(aB){if(ap){br+="&gt_ms="+ap}else{if(e&&e.timing&&e.timing.requestStart&&e.timing.responseEnd){br+="&gt_ms="+(e.timing.responseEnd-e.timing.requestStart)}}}ad(bO,bF,bu,bz,by,s(bs)&&String(bs).length?bs:bI);a2(bA,"*",ak,bl,ae);br+=H(bQ);if(aP.length){br+="&"+aP}return br}function a5(bs,br,bw,bt,bp,bz){var bu="idgoal=0",bv,bq=new Date(),bx=[],by;if(String(bs).length){bu+="&ec_id="+j(bs);bv=Math.round(bq.getTime()/1000)}bu+="&revenue="+br;if(String(bw).length){bu+="&ec_st="+bw}if(String(bt).length){bu+="&ec_tx="+bt
 }if(String(bp).length){bu+="&ec_sh="+bp}if(String(bz).length){bu+="&ec_dt="+bz}if(a0){for(by in a0){if(Object.prototype.hasOwnProperty.call(a0,by)){if(!s(a0[by][1])){a0[by][1]=""}if(!s(a0[by][2])){a0[by][2]=""}if(!s(a0[by][3])||String(a0[by][3]).length===0){a0[by][3]=0}if(!s(a0[by][4])||String(a0[by][4]).length===0){a0[by][4]=1}bx.push(a0[by])}}bu+="&ec_items="+j(JSON2.stringify(bx))}bu=av(bu,ab,"ecommerce",bv);az(bu,aO)}function a4(bp,bt,bs,br,bq,bu){if(String(bp).length&&s(bt)){a5(bp,bt,bs,br,bq,bu)}}function bj(bp){if(s(bp)){a5("",bp,"","","","")}}function aH(bs,bt){var bp=new Date(),br=av("action_name="+j(N(bs||au)),bt,"log");az(br,aO);if(Y&&an&&!aV){aV=true;M(q,"click",bb);M(q,"mouseup",bb);M(q,"mousedown",bb);M(q,"mousemove",bb);M(q,"mousewheel",bb);M(A,"DOMMouseScroll",bb);M(A,"scroll",bb);M(q,"keypress",bb);M(q,"keydown",bb);M(q,"keyup",bb);M(A,"resize",bb);M(A,"focus",bb);M(A,"blur",bb);aT=bp.getTime();setTimeout(function bq(){var bu;bp=new Date();if((aT+an)>bp.getTime()){if(Y<bp.getTime()){bu=av("ping=1",bt,"ping");
 az(bu,aO)}setTimeout(bq,an)}},an)}}function aa(br,bt,bp,bs,bu){if(String(br).length===0||String(bt).length===0){return false}var bq=av("e_c="+j(br)+"&e_a="+j(bt)+(s(bp)?"&e_n="+j(bp):"")+(s(bs)?"&e_v="+j(bs):""),bu,"event");az(bq,aO)}function ar(bp,bs,bq,bt){var br=av("search="+j(bp)+(bs?"&search_cat="+j(bs):"")+(s(bq)?"&search_count="+bq:""),bt,"sitesearch");az(br,aO)}function aM(bp,bs,br){var bq=av("idgoal="+bp+(bs?"&revenue="+bs:""),br,"goal");az(bq,aO)}function a9(bq,bp,bs){var br=av(bp+"="+j(bh(bq)),bs,"link");az(br,aO)}function be(bq,bp){if(bq!==""){return bq+bp.charAt(0).toUpperCase()+bp.slice(1)}return bp}function aq(bu){var bt,bp,bs=["","webkit","ms","moz"],br;if(!aA){for(bp=0;bp<bs.length;bp++){br=bs[bp];if(Object.prototype.hasOwnProperty.call(q,be(br,"hidden"))){if(q[be(br,"visibilityState")]==="prerender"){bt=true}break}}}if(bt){M(q,br+"visibilitychange",function bq(){q.removeEventListener(br+"visibilitychange",bq,false);bu()});return}bu()}function ao(br,bq){var bs,bp="(^| )(piwik[_-]"+bq;
@@ -27,5 +27,5 @@ M(bq,"mousedown",bn,false)}else{M(bq,"click",bn,false)}}function aG(bq){if(!aX){
 },getVisitorInfo:function(){return Q()},getAttributionInfo:function(){return O()},getAttributionCampaignName:function(){return O()[0]},getAttributionCampaignKeyword:function(){return O()[1]},getAttributionReferrerTimestamp:function(){return O()[2]},getAttributionReferrerUrl:function(){return O()[3]},setTrackerUrl:function(bp){S=bp},setSiteId:function(bp){bc=bp},setCustomData:function(bp,bq){if(C(bp)){ab=bp}else{if(!ab){ab=[]}ab[bp]=bq}},appendToTrackingUrl:function(bp){aP=bp},getCustomData:function(){return ab},setCustomVariable:function(bq,bp,bt,br){var bs;if(!s(br)){br="visit"}if(bq>0){bp=s(bp)&&!k(bp)?String(bp):bp;bt=s(bt)&&!k(bt)?String(bt):bt;bs=[bp.slice(0,bg),bt.slice(0,bg)];if(br==="visit"||br===2){R();W[bq]=bs}else{if(br==="page"||br===3){aJ[bq]=bs}else{if(br==="event"){T[bq]=bs}}}}},getCustomVariable:function(bq,br){var bp;if(!s(br)){br="visit"}if(br==="page"||br===3){bp=aJ[bq]}else{if(br==="event"){bp=T[bq]}else{if(br==="visit"||br===2){R();bp=W[bq]}}}if(!s(bp)||(bp&&bp[0]==="")){return false
 }return bp},deleteCustomVariable:function(bp,bq){if(this.getCustomVariable(bp,bq)){this.setCustomVariable(bp,"","",bq)}},setLinkTrackingTimer:function(bp){aO=bp},setDownloadExtensions:function(bp){aw=bp},addDownloadExtensions:function(bp){aw+="|"+bp},setDomains:function(bp){aQ=k(bp)?[bp]:bp;aQ.push(a7)},setIgnoreClasses:function(bp){X=k(bp)?[bp]:bp},setRequestMethod:function(bp){aS=bp||"GET"},setReferrerUrl:function(bp){aU=bp},setCustomUrl:function(bp){aE=a6(bm,bp)},setDocumentTitle:function(bp){au=bp},setAPIUrl:function(bp){aj=bp},setDownloadClasses:function(bp){aI=k(bp)?[bp]:bp},setLinkClasses:function(bp){al=k(bp)?[bp]:bp},setCampaignNameKey:function(bp){ay=k(bp)?[bp]:bp},setCampaignKeywordKey:function(bp){at=k(bp)?[bp]:bp},discardHashTag:function(bp){Z=bp},setCookieNamePrefix:function(bp){bk=bp;W=ag()},setCookieDomain:function(bp){ae=u(bp);aL()},setCookiePath:function(bp){bl=bp;aL()},setVisitorCookieTimeout:function(bp){ai=bp*1000},setSessionCookieTimeout:function(bp){ak=bp*1000},setReferralCookieTimeout:function(bp){aF=bp*1000
 },setConversionAttributionFirstReferrer:function(bp){aD=bp},disableCookies:function(){ac=true;bd.cookie="0"},deleteCookies:function(){P()},setDoNotTrack:function(bq){var bp=d.doNotTrack||d.msDoNotTrack;bf=bq&&(bp==="yes"||bp==="1");if(bf){this.disableCookies()}},addListener:function(bq,bp){aY(bq,bp)},enableLinkTracking:function(bp){if(m){aG(bp)}else{y.push(function(){aG(bp)})}},disablePerformanceTracking:function(){aB=false},setGenerationTimeMs:function(bp){ap=parseInt(bp,10)},setHeartBeatTimer:function(br,bq){var bp=new Date();Y=bp.getTime()+br*1000;an=bq*1000},killFrame:function(){if(A.location!==A.top.location){A.top.location=A.location}},redirectFile:function(bp){if(A.location.protocol==="file:"){A.location=bp}},setCountPreRendered:function(bp){aA=bp},trackGoal:function(bp,br,bq){aq(function(){aM(bp,br,bq)})},trackLink:function(bq,bp,br){aq(function(){a9(bq,bp,br)})},trackPageView:function(bp,bq){if(v(bc)){aq(function(){F(S,aj,bc)})}else{aq(function(){aH(bp,bq)})}},trackEvent:function(bq,bs,bp,br){aq(function(){aa(bq,bs,bp,br)
-})},trackSiteSearch:function(bp,br,bq){aq(function(){ar(bp,br,bq)})},setEcommerceView:function(bs,bp,br,bq){if(!s(br)||!br.length){br=""}else{if(br instanceof Array){br=JSON2.stringify(br)}}aJ[5]=["_pkc",br];if(s(bq)&&String(bq).length){aJ[2]=["_pkp",bq]}if((!s(bs)||!bs.length)&&(!s(bp)||!bp.length)){return}if(s(bs)&&bs.length){aJ[3]=["_pks",bs]}if(!s(bp)||!bp.length){bp=""}aJ[4]=["_pkn",bp]},addEcommerceItem:function(bt,bp,br,bq,bs){if(bt.length){a0[bt]=[bt,bp,br,bq,bs]}},trackEcommerceOrder:function(bp,bt,bs,br,bq,bu){a4(bp,bt,bs,br,bq,bu)},trackEcommerceCartUpdate:function(bp){bj(bp)}}}function r(){return{push:J}}M(A,"beforeunload",K,false);l();Date.prototype.getTimeAlias=Date.prototype.getTime;E=new x();for(p=0;p<_paq.length;p++){if(_paq[p][0]==="setTrackerUrl"||_paq[p][0]==="setSiteId"){J(_paq[p]);delete _paq[p]}}for(p=0;p<_paq.length;p++){if(_paq[p]){J(_paq[p])}}_paq=new r();c={addPlugin:function(O,P){a[O]=P},getTracker:function(O,P){return new x(O,P)},getAsyncTracker:function(){return E
+})},trackSiteSearch:function(bp,br,bq){aq(function(){ar(bp,br,bq)})},setEcommerceView:function(bs,bp,br,bq){if(!s(br)||!br.length){br=""}else{if(br instanceof Array){br=JSON2.stringify(br)}}aJ[5]=["_pkc",br];if(s(bq)&&String(bq).length){aJ[2]=["_pkp",bq]}if((!s(bs)||!bs.length)&&(!s(bp)||!bp.length)){return}if(s(bs)&&bs.length){aJ[3]=["_pks",bs]}if(!s(bp)||!bp.length){bp=""}aJ[4]=["_pkn",bp]},addEcommerceItem:function(bt,bp,br,bq,bs){if(bt.length){a0[bt]=[bt,bp,br,bq,bs]}},trackEcommerceOrder:function(bp,bt,bs,br,bq,bu){a4(bp,bt,bs,br,bq,bu)},trackEcommerceCartUpdate:function(bp){bj(bp)}}}function r(){return{push:J}}M(A,"beforeunload",K,false);l();Date.prototype.getTimeAlias=Date.prototype.getTime;E=new x();for(p=0;p<_paq.length;p++){if(_paq[p][0]==="setTrackerUrl"||_paq[p][0]==="setAPIUrl"||_paq[p][0]==="setSiteId"){J(_paq[p]);delete _paq[p]}}for(p=0;p<_paq.length;p++){if(_paq[p]){J(_paq[p])}}_paq=new r();c={addPlugin:function(O,P){a[O]=P},getTracker:function(O,P){return new x(O,P)},getAsyncTracker:function(){return E
 }};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return c})}return c}())}if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{return eval("piwik_"+h)}catch(i){}return}var c,e=Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}};
\ No newline at end of file