Re-generating latest piwik.js

It was modified twice today and got a merge conflict

1 files changed, 5 insertions, 5 deletions

diff --git a/piwik.js b/piwik.js
index ffbcce437f..4eb8cc8cf8 100644
--- a/piwik.js
+++ b/piwik.js
@@ -41,11 +41,11 @@ var ci;if(ce){ci=ce.target||ce.srcElement}if(!ci){ci=cd}if(!a2(ch,ci)){return}b0
 cd++){ce=aS(l.buildImpressionRequestParams(cf[cd].name,cf[cd].piece,cf[cd].target),undefined,"contentImpressions");ch.push(ce)}return ch}function aV(ce){var cd=l.collectContent(ce);return aA(cd,ce)}function bC(ce){if(!ce||!ce.length){return[]}var cd;for(cd=0;cd<ce.length;cd++){if(!l.isNodeVisible(ce[cd])){ce.splice(cd,1);cd--}}if(!ce||!ce.length){return[]}return aV(ce)}function bN(cf,cd,ce){var cg=l.buildImpressionRequestParams(cf,cd,ce);return aS(cg,null,"contentImpression")}function aU(cg,ce){if(!cg){return}var cd=l.findParentContentNode(cg);var cf=l.buildContentBlock(cd);if(!cf){return}if(!ce){ce="Unknown"}return b8(ce,cf.name,cf.piece,cf.target)}function bx(ce,cg,cd,cf){return"e_c="+k(ce)+"&e_a="+k(cg)+(v(cd)?"&e_n="+k(cd):"")+(v(cf)?"&e_v="+k(cf):"")}function ak(cf,ch,cd,cg,ci){if(String(cf).length===0||String(ch).length===0){return false}var ce=aS(bx(cf,ch,cd,cg),ci,"event");aY(ce,bn)}function aM(cd,cg,ce,ch){var cf=aS("search="+k(cd)+(cg?"&search_cat="+k(cg):"")+(v(ce)?"&search_count="+ce:""),ch,"sitesearch");
 aY(cf,bn)}function bl(cd,cg,cf){var ce=aS("idgoal="+cd+(cg?"&revenue="+cg:""),cf,"goal");aY(ce,bn)}function bO(cg,cd,ck,cj,cf){var ci=cd+"="+k(bZ(cg));var ce=aQ(cf,"click",cg);if(ce){ci+="&"+ce}var ch=aS(ci,ck,"link");aY(ch,(cj?0:bn),cj)}function bW(ce,cd){if(ce!==""){return ce+cd.charAt(0).toUpperCase()+cd.slice(1)}return cd}function aL(ci){var ch,cd,cg=["","webkit","ms","moz"],cf;if(!aZ){for(cd=0;cd<cg.length;cd++){cf=cg[cd];if(Object.prototype.hasOwnProperty.call(t,bW(cf,"hidden"))){if(t[bW(cf,"visibilityState")]==="prerender"){ch=true}break}}}if(ch){T(t,cf+"visibilitychange",function ce(){t.removeEventListener(cf+"visibilitychange",ce,false);ci()});return}ci()}function aP(cd){if(t.readyState==="complete"){cd()}else{if(F.addEventListener){F.addEventListener("load",cd)}else{if(F.attachEvent){F.attachEvent("onLoad",cd)}}}}function az(ce){var cd=false;if(t.attachEvent){cd=t.readyState==="complete"}else{cd=t.readyState!=="loading"}if(cd){ce()}else{if(t.addEventListener){t.addEventListener("DOMContentLoaded",ce)
 }else{if(t.attachEvent){t.attachEvent("onreadystatechange",ce)}}}}function bE(cd){var ce=bi(cd);if(ce&&ce.type){ce.href=E(ce.href);bO(ce.href,ce.type,undefined,null,cd)}}function cb(cd){var ce,cf;cd=cd||F.event;ce=cd.which||cd.button;cf=cd.target||cd.srcElement;if(cd.type==="click"){if(cf){bE(cf)}}else{if(cd.type==="mousedown"){if((ce===1||ce===2)&&cf){bj=ce;ar=cf}else{bj=ar=null}}else{if(cd.type==="mouseup"){if(ce===bj&&cf===ar){bE(cf)}bj=ar=null}}}}function bA(ce,cd){if(cd){T(ce,"mouseup",cb,false);T(ce,"mousedown",cb,false)}else{T(ce,"click",cb,false)}}function bc(ce){if(!bz){bz=true;var cf,cd=aG(ah,"ignore"),cg=t.links;if(cg){for(cf=0;cf<cg.length;cf++){if(!cd.test(cg[cf].className)){bA(cg[cf],ce)}}}}}function bv(cf,ch,ci){if(ax){return true}ax=true;var cj=false;var cg,ce;function cd(){cj=true}aP(function(){function ck(cm){setTimeout(function(){if(!ax){return}cj=false;ci.trackVisibleContentImpressions();ck(cm)},cm)}function cl(cm){setTimeout(function(){if(!ax){return}if(cj){cj=false;
-ci.trackVisibleContentImpressions()}cl(cm)},cm)}if(cf){cg=["scroll","resize"];for(ce=0;ce<cg.length;ce++){if(t.addEventListener){t.addEventListener(cg[ce],cd)}else{F.attachEvent("on"+cg[ce],cd)}}cl(100)}if(ch&&ch>0){ch=parseInt(ch,10);ck(ch)}})}function b1(){var ce,cf,cg={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"},cd=(new RegExp("Mac OS X.*Safari/")).test(e.userAgent)?F.devicePixelRatio||1:1;if(!((new RegExp("MSIE")).test(e.userAgent))){if(e.mimeTypes&&e.mimeTypes.length){for(ce in cg){if(Object.prototype.hasOwnProperty.call(cg,ce)){cf=e.mimeTypes[cg[ce]];bU[ce]=(cf&&cf.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&v(e.javaEnabled)&&e.javaEnabled()){bU.java="1"}if(p(F.GearsFactory)){bU.gears="1"}bU.cookie=ad()}bU.res=J.width*cd+"x"+J.height*cd
-}b1();bk();al();return{getVisitorId:function(){return bB().uuid},getVisitorInfo:function(){return X()},getAttributionInfo:function(){return W()},getAttributionCampaignName:function(){return W()[0]},getAttributionCampaignKeyword:function(){return W()[1]},getAttributionReferrerTimestamp:function(){return W()[2]},getAttributionReferrerUrl:function(){return W()[3]},setTrackerUrl:function(cd){Z=cd},getTrackerUrl:function(){return Z},getSiteId:function(){return bT},setSiteId:function(cd){b9(cd)},setUserId:function(cd){if(!v(cd)||!cd.length){return}aI=cd;a1=aW(aI).substr(0,16)},getUserId:function(){return aI},setCustomData:function(cd,ce){if(I(cd)){am=cd}else{if(!am){am={}}am[cd]=ce}},getCustomData:function(){return am},setCustomRequestProcessing:function(cd){at=cd},appendToTrackingUrl:function(cd){bo=cd},getRequest:function(cd){return aS(cd)},addPlugin:function(cd,ce){a[cd]=ce},setCustomVariable:function(ce,cd,ch,cf){var cg;if(!v(cf)){cf="visit"}if(!v(cd)){return}if(!v(ch)){ch=""}if(ce>0){cd=!m(cd)?String(cd):cd;
-ch=!m(ch)?String(ch):ch;cg=[cd.slice(0,bY),ch.slice(0,bY)];if(cf==="visit"||cf===2){Y();af[ce]=cg}else{if(cf==="page"||cf===3){bg[ce]=cg}else{if(cf==="event"){aa[ce]=cg}}}}},getCustomVariable:function(ce,cf){var cd;if(!v(cf)){cf="visit"}if(cf==="page"||cf===3){cd=bg[ce]}else{if(cf==="event"){cd=aa[ce]}else{if(cf==="visit"||cf===2){Y();cd=af[ce]}}}if(!v(cd)||(cd&&cd[0]==="")){return false}return cd},deleteCustomVariable:function(cd,ce){if(this.getCustomVariable(cd,ce)){this.setCustomVariable(cd,"","",ce)}},storeCustomVariablesInCookie:function(){a5=true},setLinkTrackingTimer:function(cd){bn=cd},setDownloadExtensions:function(cd){if(m(cd)){cd=cd.split("|")}aT=cd},addDownloadExtensions:function(ce){var cd;if(m(ce)){ce=ce.split("|")}for(cd=0;cd<ce.length;cd++){aT.push(ce[cd])}},removeDownloadExtensions:function(cf){var ce,cd=[];if(m(cf)){cf=cf.split("|")}for(ce=0;ce<aT.length;ce++){if(y(cf,aT[ce])===-1){cd.push(aT[ce])}}aT=cd},setDomains:function(cd){bp=m(cd)?[cd]:cd;bp.push(bM)},setIgnoreClasses:function(cd){ah=m(cd)?[cd]:cd
-},setRequestMethod:function(cd){bs=cd||bq},setRequestContentType:function(cd){aJ=cd||bb},setReferrerUrl:function(cd){bu=cd},setCustomUrl:function(cd){a6=bL(b6,cd)},setDocumentTitle:function(cd){aR=cd},setAPIUrl:function(cd){aw=cd},setDownloadClasses:function(cd){bf=m(cd)?[cd]:cd},setLinkClasses:function(cd){aB=m(cd)?[cd]:cd},setCampaignNameKey:function(cd){aX=m(cd)?[cd]:cd},setCampaignKeywordKey:function(cd){aO=m(cd)?[cd]:cd},discardHashTag:function(cd){aj=cd},setCookieNamePrefix:function(cd){b4=cd;af=aq()},setCookieDomain:function(cd){var ce=x(cd);if(be(ce)){ap=ce;bk()}},setCookiePath:function(cd){b5=cd;bk()},setVisitorCookieTimeout:function(cd){av=cd*1000},setSessionCookieTimeout:function(cd){ay=cd*1000},setReferralCookieTimeout:function(cd){a9=cd*1000},setConversionAttributionFirstReferrer:function(cd){a4=cd},disableCookies:function(){an=true;bU.cookie="0"},deleteCookies:function(){V()},setDoNotTrack:function(ce){var cd=e.doNotTrack||e.msDoNotTrack;bX=ce&&(cd==="yes"||cd==="1");if(bX){this.disableCookies()
-}},addListener:function(ce,cd){bA(ce,cd)},enableLinkTracking:function(cd){bV=true;if(o){bc(cd)}else{D.push(function(){bc(cd)})}},enableJSErrorTracking:function(){if(ca){return}ca=true;var cd=F.onerror;F.onerror=function(ci,cg,cf,ch,ce){aL(function(){var cj="JavaScript Errors";var ck=cg+":"+cf;if(ch){ck+=":"+ch}ak(cj,ck,ci)});if(cd){return cd(ci,cg,cf,ch,ce)}return false}},disablePerformanceTracking:function(){a0=false},setGenerationTimeMs:function(cd){aH=parseInt(cd,10)},setHeartBeatTimer:function(cf,ce){var cd=new Date();ai=cd.getTime()+cf*1000;aF=ce*1000},killFrame:function(){if(F.location!==F.top.location){F.top.location=F.location}},redirectFile:function(cd){if(F.location.protocol==="file:"){F.location=cd}},setCountPreRendered:function(cd){aZ=cd},trackGoal:function(cd,cf,ce){aL(function(){bl(cd,cf,ce)})},trackLink:function(ce,cd,cg,cf){aL(function(){bO(ce,cd,cg,cf)})},trackPageView:function(cd,ce){ag=[];if(z(bT)){aL(function(){L(Z,aw,bT)})}else{aL(function(){bd(cd,ce)})}},trackAllContentImpressions:function(){if(z(bT)){return
+ci.trackVisibleContentImpressions()}cl(cm)},cm)}if(cf){cg=["scroll","resize"];for(ce=0;ce<cg.length;ce++){if(t.addEventListener){t.addEventListener(cg[ce],cd)}else{F.attachEvent("on"+cg[ce],cd)}}cl(100)}if(ch&&ch>0){ch=parseInt(ch,10);ck(ch)}})}function b1(){var ce,cf,cg={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"},cd=F.devicePixelRatio||1;if(!((new RegExp("MSIE")).test(e.userAgent))){if(e.mimeTypes&&e.mimeTypes.length){for(ce in cg){if(Object.prototype.hasOwnProperty.call(cg,ce)){cf=e.mimeTypes[cg[ce]];bU[ce]=(cf&&cf.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&v(e.javaEnabled)&&e.javaEnabled()){bU.java="1"}if(p(F.GearsFactory)){bU.gears="1"}bU.cookie=ad()}bU.res=J.width*cd+"x"+J.height*cd}b1();bk();al();return{getVisitorId:function(){return bB().uuid
+},getVisitorInfo:function(){return X()},getAttributionInfo:function(){return W()},getAttributionCampaignName:function(){return W()[0]},getAttributionCampaignKeyword:function(){return W()[1]},getAttributionReferrerTimestamp:function(){return W()[2]},getAttributionReferrerUrl:function(){return W()[3]},setTrackerUrl:function(cd){Z=cd},getTrackerUrl:function(){return Z},getSiteId:function(){return bT},setSiteId:function(cd){b9(cd)},setUserId:function(cd){if(!v(cd)||!cd.length){return}aI=cd;a1=aW(aI).substr(0,16)},getUserId:function(){return aI},setCustomData:function(cd,ce){if(I(cd)){am=cd}else{if(!am){am={}}am[cd]=ce}},getCustomData:function(){return am},setCustomRequestProcessing:function(cd){at=cd},appendToTrackingUrl:function(cd){bo=cd},getRequest:function(cd){return aS(cd)},addPlugin:function(cd,ce){a[cd]=ce},setCustomVariable:function(ce,cd,ch,cf){var cg;if(!v(cf)){cf="visit"}if(!v(cd)){return}if(!v(ch)){ch=""}if(ce>0){cd=!m(cd)?String(cd):cd;ch=!m(ch)?String(ch):ch;cg=[cd.slice(0,bY),ch.slice(0,bY)];
+if(cf==="visit"||cf===2){Y();af[ce]=cg}else{if(cf==="page"||cf===3){bg[ce]=cg}else{if(cf==="event"){aa[ce]=cg}}}}},getCustomVariable:function(ce,cf){var cd;if(!v(cf)){cf="visit"}if(cf==="page"||cf===3){cd=bg[ce]}else{if(cf==="event"){cd=aa[ce]}else{if(cf==="visit"||cf===2){Y();cd=af[ce]}}}if(!v(cd)||(cd&&cd[0]==="")){return false}return cd},deleteCustomVariable:function(cd,ce){if(this.getCustomVariable(cd,ce)){this.setCustomVariable(cd,"","",ce)}},storeCustomVariablesInCookie:function(){a5=true},setLinkTrackingTimer:function(cd){bn=cd},setDownloadExtensions:function(cd){if(m(cd)){cd=cd.split("|")}aT=cd},addDownloadExtensions:function(ce){var cd;if(m(ce)){ce=ce.split("|")}for(cd=0;cd<ce.length;cd++){aT.push(ce[cd])}},removeDownloadExtensions:function(cf){var ce,cd=[];if(m(cf)){cf=cf.split("|")}for(ce=0;ce<aT.length;ce++){if(y(cf,aT[ce])===-1){cd.push(aT[ce])}}aT=cd},setDomains:function(cd){bp=m(cd)?[cd]:cd;bp.push(bM)},setIgnoreClasses:function(cd){ah=m(cd)?[cd]:cd},setRequestMethod:function(cd){bs=cd||bq
+},setRequestContentType:function(cd){aJ=cd||bb},setReferrerUrl:function(cd){bu=cd},setCustomUrl:function(cd){a6=bL(b6,cd)},setDocumentTitle:function(cd){aR=cd},setAPIUrl:function(cd){aw=cd},setDownloadClasses:function(cd){bf=m(cd)?[cd]:cd},setLinkClasses:function(cd){aB=m(cd)?[cd]:cd},setCampaignNameKey:function(cd){aX=m(cd)?[cd]:cd},setCampaignKeywordKey:function(cd){aO=m(cd)?[cd]:cd},discardHashTag:function(cd){aj=cd},setCookieNamePrefix:function(cd){b4=cd;af=aq()},setCookieDomain:function(cd){var ce=x(cd);if(be(ce)){ap=ce;bk()}},setCookiePath:function(cd){b5=cd;bk()},setVisitorCookieTimeout:function(cd){av=cd*1000},setSessionCookieTimeout:function(cd){ay=cd*1000},setReferralCookieTimeout:function(cd){a9=cd*1000},setConversionAttributionFirstReferrer:function(cd){a4=cd},disableCookies:function(){an=true;bU.cookie="0"},deleteCookies:function(){V()},setDoNotTrack:function(ce){var cd=e.doNotTrack||e.msDoNotTrack;bX=ce&&(cd==="yes"||cd==="1");if(bX){this.disableCookies()}},addListener:function(ce,cd){bA(ce,cd)
+},enableLinkTracking:function(cd){bV=true;if(o){bc(cd)}else{D.push(function(){bc(cd)})}},enableJSErrorTracking:function(){if(ca){return}ca=true;var cd=F.onerror;F.onerror=function(ci,cg,cf,ch,ce){aL(function(){var cj="JavaScript Errors";var ck=cg+":"+cf;if(ch){ck+=":"+ch}ak(cj,ck,ci)});if(cd){return cd(ci,cg,cf,ch,ce)}return false}},disablePerformanceTracking:function(){a0=false},setGenerationTimeMs:function(cd){aH=parseInt(cd,10)},setHeartBeatTimer:function(cf,ce){var cd=new Date();ai=cd.getTime()+cf*1000;aF=ce*1000},killFrame:function(){if(F.location!==F.top.location){F.top.location=F.location}},redirectFile:function(cd){if(F.location.protocol==="file:"){F.location=cd}},setCountPreRendered:function(cd){aZ=cd},trackGoal:function(cd,cf,ce){aL(function(){bl(cd,cf,ce)})},trackLink:function(ce,cd,cg,cf){aL(function(){bO(ce,cd,cg,cf)})},trackPageView:function(cd,ce){ag=[];if(z(bT)){aL(function(){L(Z,aw,bT)})}else{aL(function(){bd(cd,ce)})}},trackAllContentImpressions:function(){if(z(bT)){return
 }aL(function(){az(function(){var cd=l.findContentNodes();var ce=aV(cd);ao(ce,bn)})})},trackVisibleContentImpressions:function(cd,ce){if(z(bT)){return}if(!v(cd)){cd=true}if(!v(ce)){ce=750}bv(cd,ce,this);aL(function(){aP(function(){var cf=l.findContentNodes();var cg=bC(cf);ao(cg,bn)})})},trackContentImpression:function(cf,cd,ce){if(z(bT)){return}if(!cf){return}cd=cd||"Unknown";aL(function(){var cg=bN(cf,cd,ce);aY(cg,bn)})},trackContentImpressionsWithinNode:function(cd){if(z(bT)||!cd){return}aL(function(){if(ax){aP(function(){var ce=l.findContentNodesWithinNode(cd);var cf=bC(ce);ao(cf,bn)})}else{az(function(){var ce=l.findContentNodesWithinNode(cd);var cf=aV(ce);ao(cf,bn)})}})},trackContentInteraction:function(cf,cg,cd,ce){if(z(bT)){return}if(!cf||!cg){return}cd=cd||"Unknown";aL(function(){var ch=b8(cf,cg,cd,ce);aY(ch,bn)})},trackContentInteractionNode:function(ce,cd){if(z(bT)||!ce){return}aL(function(){var cf=aU(ce,cd);aY(cf,bn)})},trackEvent:function(ce,cg,cd,cf){aL(function(){ak(ce,cg,cd,cf)
 })},trackSiteSearch:function(cd,cf,ce){aL(function(){aM(cd,cf,ce)})},setEcommerceView:function(cg,cd,cf,ce){if(!v(cf)||!cf.length){cf=""}else{if(cf instanceof Array){cf=JSON2.stringify(cf)}}bg[5]=["_pkc",cf];if(v(ce)&&String(ce).length){bg[2]=["_pkp",ce]}if((!v(cg)||!cg.length)&&(!v(cd)||!cd.length)){return}if(v(cg)&&cg.length){bg[3]=["_pks",cg]}if(!v(cd)||!cd.length){cd=""}bg[4]=["_pkn",cd]},addEcommerceItem:function(ch,cd,cf,ce,cg){if(ch.length){bF[ch]=[ch,cd,cf,ce,cg]}},trackEcommerceOrder:function(cd,ch,cg,cf,ce,ci){bJ(cd,ch,cg,cf,ce,ci)},trackEcommerceCartUpdate:function(cd){b3(cd)}}}function u(){return{push:Q}}T(F,"beforeunload",R,false);n();Date.prototype.getTimeAlias=Date.prototype.getTime;K=new C();var q={setTrackerUrl:1,setAPIUrl:1,setUserId:1,setSiteId:1,disableCookies:1,enableLinkTracking:1};var d;for(s=0;s<_paq.length;s++){d=_paq[s][0];if(q[d]){Q(_paq[s]);delete _paq[s];if(q[d]>1){if(console!==undefined&&console&&console.error){console.error("The method "+d+' 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: http://developer.piwik.org/guides/tracking-javascript-guide#multiple-piwik-trackers')
 }}q[d]++}}for(s=0;s<_paq.length;s++){if(_paq[s]){Q(_paq[s])}}_paq=new u();c={addPlugin:function(V,W){a[V]=W},getTracker:function(V,W){if(!v(W)){W=this.getAsyncTracker().getSiteId()}if(!v(V)){V=this.getAsyncTracker().getTrackerUrl()}return new C(V,W)},getAsyncTracker:function(){return K}};if(typeof define==="function"&&define.amd){define("piwik",[],function(){return c})}return c}())}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=Piwik}}());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);