Refs #3490 Add `getUserId` Javascript helper + test

1 files changed, 7 insertions, 7 deletions

diff --git a/piwik.js b/piwik.js
index c48dfd58db..946b17590c 100644
--- a/piwik.js
+++ b/piwik.js
@@ -42,12 +42,12 @@ b7.push(b4)}return b7}function aU(b4){var b3=m.collectContent(b4);return aB(b3,b
 aX(b4,bi)}function bI(b6,b3,ca,b9,b5){var b8=b3+"="+l(bS(b6));var b4=aP(b5,"click",b6);if(b4){b8+="&"+b4}var b7=aR(b8,ca,"link");aX(b7,(b9?0:bi),b9)}function bP(b4,b3){if(b4!==""){return b4+b3.charAt(0).toUpperCase()+b3.slice(1)}return b3}function aK(b8){var b7,b3,b6=["","webkit","ms","moz"],b5;if(!aY){for(b3=0;b3<b6.length;b3++){b5=b6[b3];if(Object.prototype.hasOwnProperty.call(u,bP(b5,"hidden"))){if(u[bP(b5,"visibilityState")]==="prerender"){b7=true}break}}}if(b7){U(u,b5+"visibilitychange",function b4(){u.removeEventListener(b5+"visibilitychange",b4,false);b8()});return}b8()}function aO(b3){if(u.readyState==="complete"){b3()}else{if(G.addEventListener){G.addEventListener("load",b3)}else{if(G.attachEvent){G.attachEvent("onLoad",b3)}}}}function aA(b4){var b3=false;if(u.attachEvent){b3=u.readyState==="complete"}else{b3=u.readyState!=="loading"}if(b3){b4()}else{if(u.addEventListener){u.addEventListener("DOMContentLoaded",b4)}else{if(u.attachEvent){u.attachEvent("onreadystatechange",b4)}}}}function by(b3){var b4=bd(b3);
 if(b4&&b4.type){b4.href=h(b4.href);bI(b4.href,b4.type,undefined,null,b3)}}function b1(b3){var b4,b5;b3=b3||G.event;b4=b3.which||b3.button;b5=b3.target||b3.srcElement;if(b3.type==="click"){if(b5){by(b5)}}else{if(b3.type==="mousedown"){if((b4===1||b4===2)&&b5){be=b4;at=b5}else{be=at=null}}else{if(b3.type==="mouseup"){if(b4===be&&b5===at){by(b5)}be=at=null}}}}function bv(b4,b3){if(b3){U(b4,"mouseup",b1,false);U(b4,"mousedown",b1,false)}else{U(b4,"click",b1,false)}}function a8(b4){if(!bu){bu=true;var b5,b3=aG(ai,"ignore"),b6=u.links;if(b6){for(b5=0;b5<b6.length;b5++){if(!b3.test(b6[b5].className)){bv(b6[b5],b4)}}}}}function bq(b5,b7,b8){if(ay){return true}ay=true;var b9=false;var b6,b4;function b3(){b9=true}aO(function(){function ca(cc){setTimeout(function(){if(!ay){return}b9=false;b8.trackVisibleContentImpressions();ca(cc)},cc)}function cb(cc){setTimeout(function(){if(!ay){return}if(b9){b9=false;b8.trackVisibleContentImpressions()}cb(cc)},cc)}if(b5){b6=["scroll","resize"];for(b4=0;b4<b6.length;
 b4++){if(u.addEventListener){u.addEventListener(b6[b4],b3)}else{G.attachEvent("on"+b6[b4],b3)}}cb(100)}if(b7&&b7>0){b7=parseInt(b7,10);ca(b7)}})}function bT(){var b4,b5,b6={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"},b3=(new RegExp("Mac OS X.*Safari/")).test(e.userAgent)?G.devicePixelRatio||1:1;if(!((new RegExp("MSIE")).test(e.userAgent))){if(e.mimeTypes&&e.mimeTypes.length){for(b4 in b6){if(Object.prototype.hasOwnProperty.call(b6,b4)){b5=e.mimeTypes[b6[b4]];bN[b4]=(b5&&b5.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&w(e.javaEnabled)&&e.javaEnabled()){bN.java="1"}if(q(G.GearsFactory)){bN.gears="1"}bN.cookie=ae()}bN.res=K.width*b3+"x"+K.height*b3}bT();bf();return{getVisitorId:function(){return(Y())[1]},getVisitorInfo:function(){return Y()},getAttributionInfo:function(){return X()
-},getAttributionCampaignName:function(){return X()[0]},getAttributionCampaignKeyword:function(){return X()[1]},getAttributionReferrerTimestamp:function(){return X()[2]},getAttributionReferrerUrl:function(){return X()[3]},setTrackerUrl:function(b3){aa=b3},setSiteId:function(b3){bM=b3},setUserId:function(b3){aI=b3},setCustomData:function(b3,b4){if(J(b3)){an=b3}else{if(!an){an={}}an[b3]=b4}},getCustomData:function(){return an},setCustomRequestProcessing:function(b3){au=b3},appendToTrackingUrl:function(b3){bj=b3},getRequest:function(b3){return aR(b3)},addPlugin:function(b3,b4){a[b3]=b4},setCustomVariable:function(b4,b3,b7,b5){var b6;if(!w(b5)){b5="visit"}if(!w(b3)){return}if(!w(b7)){b7=""}if(b4>0){b3=!n(b3)?String(b3):b3;b7=!n(b7)?String(b7):b7;b6=[b3.slice(0,bR),b7.slice(0,bR)];if(b5==="visit"||b5===2){Z();ag[b4]=b6}else{if(b5==="page"||b5===3){bb[b4]=b6}else{if(b5==="event"){ab[b4]=b6}}}}},getCustomVariable:function(b4,b5){var b3;if(!w(b5)){b5="visit"}if(b5==="page"||b5===3){b3=bb[b4]}else{if(b5==="event"){b3=ab[b4]
-}else{if(b5==="visit"||b5===2){Z();b3=ag[b4]}}}if(!w(b3)||(b3&&b3[0]==="")){return false}return b3},deleteCustomVariable:function(b3,b4){if(this.getCustomVariable(b3,b4)){this.setCustomVariable(b3,"","",b4)}},storeCustomVariablesInCookie:function(){a3=true},setLinkTrackingTimer:function(b3){bi=b3},setDownloadExtensions:function(b3){aS=b3},addDownloadExtensions:function(b3){aS+="|"+b3},setDomains:function(b3){bk=n(b3)?[b3]:b3;bk.push(bG)},setIgnoreClasses:function(b3){ai=n(b3)?[b3]:b3},setRequestMethod:function(b3){bn=b3||bl},setRequestContentType:function(b3){aJ=b3||a7},setReferrerUrl:function(b3){bp=b3},setCustomUrl:function(b3){a4=bF(bX,b3)},setDocumentTitle:function(b3){aQ=b3},setAPIUrl:function(b3){ax=b3},setDownloadClasses:function(b3){ba=n(b3)?[b3]:b3},setLinkClasses:function(b3){aC=n(b3)?[b3]:b3},setCampaignNameKey:function(b3){aW=n(b3)?[b3]:b3},setCampaignKeywordKey:function(b3){aN=n(b3)?[b3]:b3},discardHashTag:function(b3){ak=b3},setCookieNamePrefix:function(b3){bV=b3;ag=ar()},setCookieDomain:function(b3){aq=y(b3);
-bf()},setCookiePath:function(b3){bW=b3;bf()},setVisitorCookieTimeout:function(b3){aw=b3*1000},setSessionCookieTimeout:function(b3){az=b3*1000},setReferralCookieTimeout:function(b3){a6=b3*1000},setConversionAttributionFirstReferrer:function(b3){a2=b3},disableCookies:function(){ao=true;bN.cookie="0"},deleteCookies:function(){W()},setDoNotTrack:function(b4){var b3=e.doNotTrack||e.msDoNotTrack;bQ=b4&&(b3==="yes"||b3==="1");if(bQ){this.disableCookies()}},addListener:function(b4,b3){bv(b4,b3)},enableLinkTracking:function(b3){bO=true;if(p){a8(b3)}else{E.push(function(){a8(b3)})}},enableJSErrorTracking:function(){if(b0){return}b0=true;var b3=G.onerror;G.onerror=function(b8,b6,b5,b7,b4){aK(function(){var b9="JavaScript Errors";var ca=b6+":"+b5;if(b7){ca+=":"+b7}al(b9,ca,b8)});if(b3){return b3(b8,b6,b5,b7,b4)}return false}},disablePerformanceTracking:function(){aZ=false},setGenerationTimeMs:function(b3){aH=parseInt(b3,10)},setHeartBeatTimer:function(b5,b4){var b3=new Date();aj=b3.getTime()+b5*1000;
-aF=b4*1000},killFrame:function(){if(G.location!==G.top.location){G.top.location=G.location}},redirectFile:function(b3){if(G.location.protocol==="file:"){G.location=b3}},setCountPreRendered:function(b3){aY=b3},trackGoal:function(b3,b5,b4){aK(function(){bg(b3,b5,b4)})},trackLink:function(b4,b3,b6,b5){aK(function(){bI(b4,b3,b6,b5)})},trackPageView:function(b3,b4){ah=[];if(A(bM)){aK(function(){M(aa,ax,bM)})}else{aK(function(){a9(b3,b4)})}},trackAllContentImpressions:function(){if(A(bM)){return}aK(function(){aA(function(){var b3=m.findContentNodes();var b4=aU(b3);ap(b4,bi)})})},trackVisibleContentImpressions:function(b3,b4){if(A(bM)){return}if(!w(b3)){b3=true}if(!w(b4)){b4=750}bq(b3,b4,this);aK(function(){aO(function(){var b5=m.findContentNodes();var b6=bw(b5);ap(b6,bi)})})},trackContentImpression:function(b5,b3,b4){if(A(bM)){return}if(!b5){return}b3=b3||"Unknown";aK(function(){var b6=bH(b5,b3,b4);aX(b6,bi)})},trackContentImpressionsWithinNode:function(b3){if(A(bM)||!b3){return}aK(function(){if(ay){aO(function(){var b4=m.findContentNodesWithinNode(b3);
-var b5=bw(b4);ap(b5,bi)})}else{aA(function(){var b4=m.findContentNodesWithinNode(b3);var b5=aU(b4);ap(b5,bi)})}})},trackContentInteraction:function(b5,b6,b3,b4){if(A(bM)){return}if(!b5||!b6){return}b3=b3||"Unknown";aK(function(){var b7=bZ(b5,b6,b3,b4);aX(b7,bi)})},trackContentInteractionNode:function(b4,b3){if(A(bM)||!b4){return}aK(function(){var b5=aT(b4,b3);aX(b5,bi)})},trackEvent:function(b4,b6,b3,b5){aK(function(){al(b4,b6,b3,b5)})},trackSiteSearch:function(b3,b5,b4){aK(function(){aL(b3,b5,b4)})},setEcommerceView:function(b6,b3,b5,b4){if(!w(b5)||!b5.length){b5=""}else{if(b5 instanceof Array){b5=JSON2.stringify(b5)}}bb[5]=["_pkc",b5];if(w(b4)&&String(b4).length){bb[2]=["_pkp",b4]}if((!w(b6)||!b6.length)&&(!w(b3)||!b3.length)){return}if(w(b6)&&b6.length){bb[3]=["_pks",b6]}if(!w(b3)||!b3.length){b3=""}bb[4]=["_pkn",b3]},addEcommerceItem:function(b7,b3,b5,b4,b6){if(b7.length){bz[b7]=[b7,b3,b5,b4,b6]}},trackEcommerceOrder:function(b3,b7,b6,b5,b4,b8){bD(b3,b7,b6,b5,b4,b8)},trackEcommerceCartUpdate:function(b3){bU(b3)
-}}}function v(){return{push:R}}U(G,"beforeunload",S,false);o();Date.prototype.getTimeAlias=Date.prototype.getTime;L=new D();var r={setTrackerUrl:1,setAPIUrl:1,setSiteId:1,disableCookies:1,enableLinkTracking:1};var d;for(t=0;t<_paq.length;t++){d=_paq[t][0];if(r[d]){R(_paq[t]);delete _paq[t];if(r[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/api-reference/tracking-javascript#multiple-piwik-trackers')}}r[d]++}}for(t=0;t<_paq.length;t++){if(_paq[t]){R(_paq[t])}}_paq=new v();c={addPlugin:function(W,X){a[W]=X},getTracker:function(W,X){return new D(W,X)},getAsyncTracker:function(){return L}};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);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}};
+},getAttributionCampaignName:function(){return X()[0]},getAttributionCampaignKeyword:function(){return X()[1]},getAttributionReferrerTimestamp:function(){return X()[2]},getAttributionReferrerUrl:function(){return X()[3]},setTrackerUrl:function(b3){aa=b3},setSiteId:function(b3){bM=b3},setUserId:function(b3){aI=b3},getUserId:function(){return aI},setCustomData:function(b3,b4){if(J(b3)){an=b3}else{if(!an){an={}}an[b3]=b4}},getCustomData:function(){return an},setCustomRequestProcessing:function(b3){au=b3},appendToTrackingUrl:function(b3){bj=b3},getRequest:function(b3){return aR(b3)},addPlugin:function(b3,b4){a[b3]=b4},setCustomVariable:function(b4,b3,b7,b5){var b6;if(!w(b5)){b5="visit"}if(!w(b3)){return}if(!w(b7)){b7=""}if(b4>0){b3=!n(b3)?String(b3):b3;b7=!n(b7)?String(b7):b7;b6=[b3.slice(0,bR),b7.slice(0,bR)];if(b5==="visit"||b5===2){Z();ag[b4]=b6}else{if(b5==="page"||b5===3){bb[b4]=b6}else{if(b5==="event"){ab[b4]=b6}}}}},getCustomVariable:function(b4,b5){var b3;if(!w(b5)){b5="visit"}if(b5==="page"||b5===3){b3=bb[b4]
+}else{if(b5==="event"){b3=ab[b4]}else{if(b5==="visit"||b5===2){Z();b3=ag[b4]}}}if(!w(b3)||(b3&&b3[0]==="")){return false}return b3},deleteCustomVariable:function(b3,b4){if(this.getCustomVariable(b3,b4)){this.setCustomVariable(b3,"","",b4)}},storeCustomVariablesInCookie:function(){a3=true},setLinkTrackingTimer:function(b3){bi=b3},setDownloadExtensions:function(b3){aS=b3},addDownloadExtensions:function(b3){aS+="|"+b3},setDomains:function(b3){bk=n(b3)?[b3]:b3;bk.push(bG)},setIgnoreClasses:function(b3){ai=n(b3)?[b3]:b3},setRequestMethod:function(b3){bn=b3||bl},setRequestContentType:function(b3){aJ=b3||a7},setReferrerUrl:function(b3){bp=b3},setCustomUrl:function(b3){a4=bF(bX,b3)},setDocumentTitle:function(b3){aQ=b3},setAPIUrl:function(b3){ax=b3},setDownloadClasses:function(b3){ba=n(b3)?[b3]:b3},setLinkClasses:function(b3){aC=n(b3)?[b3]:b3},setCampaignNameKey:function(b3){aW=n(b3)?[b3]:b3},setCampaignKeywordKey:function(b3){aN=n(b3)?[b3]:b3},discardHashTag:function(b3){ak=b3},setCookieNamePrefix:function(b3){bV=b3;
+ag=ar()},setCookieDomain:function(b3){aq=y(b3);bf()},setCookiePath:function(b3){bW=b3;bf()},setVisitorCookieTimeout:function(b3){aw=b3*1000},setSessionCookieTimeout:function(b3){az=b3*1000},setReferralCookieTimeout:function(b3){a6=b3*1000},setConversionAttributionFirstReferrer:function(b3){a2=b3},disableCookies:function(){ao=true;bN.cookie="0"},deleteCookies:function(){W()},setDoNotTrack:function(b4){var b3=e.doNotTrack||e.msDoNotTrack;bQ=b4&&(b3==="yes"||b3==="1");if(bQ){this.disableCookies()}},addListener:function(b4,b3){bv(b4,b3)},enableLinkTracking:function(b3){bO=true;if(p){a8(b3)}else{E.push(function(){a8(b3)})}},enableJSErrorTracking:function(){if(b0){return}b0=true;var b3=G.onerror;G.onerror=function(b8,b6,b5,b7,b4){aK(function(){var b9="JavaScript Errors";var ca=b6+":"+b5;if(b7){ca+=":"+b7}al(b9,ca,b8)});if(b3){return b3(b8,b6,b5,b7,b4)}return false}},disablePerformanceTracking:function(){aZ=false},setGenerationTimeMs:function(b3){aH=parseInt(b3,10)},setHeartBeatTimer:function(b5,b4){var b3=new Date();
+aj=b3.getTime()+b5*1000;aF=b4*1000},killFrame:function(){if(G.location!==G.top.location){G.top.location=G.location}},redirectFile:function(b3){if(G.location.protocol==="file:"){G.location=b3}},setCountPreRendered:function(b3){aY=b3},trackGoal:function(b3,b5,b4){aK(function(){bg(b3,b5,b4)})},trackLink:function(b4,b3,b6,b5){aK(function(){bI(b4,b3,b6,b5)})},trackPageView:function(b3,b4){ah=[];if(A(bM)){aK(function(){M(aa,ax,bM)})}else{aK(function(){a9(b3,b4)})}},trackAllContentImpressions:function(){if(A(bM)){return}aK(function(){aA(function(){var b3=m.findContentNodes();var b4=aU(b3);ap(b4,bi)})})},trackVisibleContentImpressions:function(b3,b4){if(A(bM)){return}if(!w(b3)){b3=true}if(!w(b4)){b4=750}bq(b3,b4,this);aK(function(){aO(function(){var b5=m.findContentNodes();var b6=bw(b5);ap(b6,bi)})})},trackContentImpression:function(b5,b3,b4){if(A(bM)){return}if(!b5){return}b3=b3||"Unknown";aK(function(){var b6=bH(b5,b3,b4);aX(b6,bi)})},trackContentImpressionsWithinNode:function(b3){if(A(bM)||!b3){return
+}aK(function(){if(ay){aO(function(){var b4=m.findContentNodesWithinNode(b3);var b5=bw(b4);ap(b5,bi)})}else{aA(function(){var b4=m.findContentNodesWithinNode(b3);var b5=aU(b4);ap(b5,bi)})}})},trackContentInteraction:function(b5,b6,b3,b4){if(A(bM)){return}if(!b5||!b6){return}b3=b3||"Unknown";aK(function(){var b7=bZ(b5,b6,b3,b4);aX(b7,bi)})},trackContentInteractionNode:function(b4,b3){if(A(bM)||!b4){return}aK(function(){var b5=aT(b4,b3);aX(b5,bi)})},trackEvent:function(b4,b6,b3,b5){aK(function(){al(b4,b6,b3,b5)})},trackSiteSearch:function(b3,b5,b4){aK(function(){aL(b3,b5,b4)})},setEcommerceView:function(b6,b3,b5,b4){if(!w(b5)||!b5.length){b5=""}else{if(b5 instanceof Array){b5=JSON2.stringify(b5)}}bb[5]=["_pkc",b5];if(w(b4)&&String(b4).length){bb[2]=["_pkp",b4]}if((!w(b6)||!b6.length)&&(!w(b3)||!b3.length)){return}if(w(b6)&&b6.length){bb[3]=["_pks",b6]}if(!w(b3)||!b3.length){b3=""}bb[4]=["_pkn",b3]},addEcommerceItem:function(b7,b3,b5,b4,b6){if(b7.length){bz[b7]=[b7,b3,b5,b4,b6]}},trackEcommerceOrder:function(b3,b7,b6,b5,b4,b8){bD(b3,b7,b6,b5,b4,b8)
+},trackEcommerceCartUpdate:function(b3){bU(b3)}}}function v(){return{push:R}}U(G,"beforeunload",S,false);o();Date.prototype.getTimeAlias=Date.prototype.getTime;L=new D();var r={setTrackerUrl:1,setAPIUrl:1,setSiteId:1,disableCookies:1,enableLinkTracking:1};var d;for(t=0;t<_paq.length;t++){d=_paq[t][0];if(r[d]){R(_paq[t]);delete _paq[t];if(r[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/api-reference/tracking-javascript#multiple-piwik-trackers')}}r[d]++}}for(t=0;t<_paq.length;t++){if(_paq[t]){R(_paq[t])}}_paq=new v();c={addPlugin:function(W,X){a[W]=X},getTracker:function(W,X){return new D(W,X)},getAsyncTracker:function(){return L}};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);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}};
 /*! @license-end */
 };
\ No newline at end of file