fixes #3292 - css classes take priority when determining link type

git-svn-id: http://dev.piwik.org/svn/trunk@6621 59fd770c-687e-43c8-a1e3-f5a4ff64c105

1 files changed, 5 insertions, 5 deletions

diff --git a/piwik.js b/piwik.js
index 12f3928520..a2ca9fde73 100644
--- a/piwik.js
+++ b/piwik.js
@@ -20,9 +20,9 @@ if(be){bd=be.split(".");bd.unshift("0")}else{if(!ap){ap=al((j.userAgent||"")+(j.
 }}}}bF=y(aH);bo=by.length?y(by):"";if(bF.length&&!aE(bF)&&(!aq||!bo.length||aE(bo))){by=aH}if(by.length||bj.length){bi=bl;bx=[bj,bb,bi,a3(by.slice(0,bg))];aP(bn,JSON2.stringify(bx),at,a7,V,Y)}}bd+="&idsite="+aY+"&rec=1&r="+String(Math.random()).slice(2,8)+"&h="+bc.getHours()+"&m="+bc.getMinutes()+"&s="+bc.getSeconds()+"&url="+e(a3(bD))+(aH.length?"&urlref="+e(a3(aH)):"")+"&_id="+bA+"&_idts="+bs+"&_idvc="+bh+"&_idn="+bE+(bj.length?"&_rcn="+e(bj):"")+(bb.length?"&_rck="+e(bb):"")+"&_refts="+bi+"&_viewts="+bk+(String(bu).length?"&_ects="+bu:"")+(String(by).length?"&_ref="+e(a3(by.slice(0,bg))):"");var be=JSON2.stringify(ax);if(be.length>2){bd+="&cvar="+e(be)}for(bz in aZ){if(Object.prototype.hasOwnProperty.call(aZ,bz)){bd+="&"+bz+"="+aZ[bz]}}if(bB){bd+="&data="+e(JSON2.stringify(bB))}else{if(S){bd+="&data="+e(JSON2.stringify(S))}}if(O){var br=JSON2.stringify(O);if(br.length>2){bd+="&_cvar="+e(br)}for(bz in bv){if(Object.prototype.hasOwnProperty.call(bv,bz)){if(O[bz][0]===""||O[bz][1]===""){delete O[bz]
 }}}aP(bG,JSON2.stringify(O),ab,a7,V,Y)}U(bA,bs,bh,bl,bk,b(bf)&&String(bf).length?bf:bu);aP(bm,"*",ab,a7,V,Y);bd+=g(bC);return bd}function aS(be,bd,bi,bf,bb,bl){var bg="idgoal=0",bh,bc=new Date(),bj=[],bk;if(String(be).length){bg+="&ec_id="+e(be);bh=Math.round(bc.getTime()/1000)}bg+="&revenue="+bd;if(String(bi).length){bg+="&ec_st="+bi}if(String(bf).length){bg+="&ec_tx="+bf}if(String(bb).length){bg+="&ec_sh="+bb}if(String(bl).length){bg+="&ec_dt="+bl}if(aN){for(bk in aN){if(Object.prototype.hasOwnProperty.call(aN,bk)){if(!b(aN[bk][1])){aN[bk][1]=""}if(!b(aN[bk][2])){aN[bk][2]=""}if(!b(aN[bk][3])||String(aN[bk][3]).length===0){aN[bk][3]=0}if(!b(aN[bk][4])||String(aN[bk][4]).length===0){aN[bk][4]=1}bj.push(aN[bk])}}bg+="&ec_items="+e(JSON2.stringify(bj))}bg=aj(bg,S,"ecommerce",bh);an(bg,aC)}function aR(bb,bf,be,bd,bc,bg){if(String(bb).length&&b(bf)){aS(bb,bf,be,bd,bc,bg)}}function a5(bb){if(b(bb)){aS("",bb,"","","","")}}function av(be,bf){var bb=new Date(),bd=aj("action_name="+e(l(be||ai)),bf,"log");
 an(bd,aC);if(Q&&ae&&!aI){aI=true;t(d,"click",aX);t(d,"mouseup",aX);t(d,"mousedown",aX);t(d,"mousemove",aX);t(d,"mousewheel",aX);t(H,"DOMMouseScroll",aX);t(H,"scroll",aX);t(d,"keypress",aX);t(d,"keydown",aX);t(d,"keyup",aX);t(H,"resize",aX);t(H,"focus",aX);t(H,"blur",aX);aG=bb.getTime();setTimeout(function bc(){var bg=new Date(),bh;if((aG+ae)>bg.getTime()){if(Q<bg.getTime()){bh=aj("ping=1",bf,"ping");an(bh,aC)}setTimeout(bc,ae)}},ae)}}function aA(bb,be,bd){var bc=aj("idgoal="+bb+(be?"&revenue="+be:""),bd,"goal");an(bc,aC)}function aW(bc,bb,be){var bd=aj(bb+"="+e(a3(bc)),be,"link");an(bd,aC)}function a0(bc,bb){if(bc!==""){return bc+bb.charAt(0).toUpperCase()+bb.slice(1)}return bb}function ag(bg){var bf,bb,be=["","webkit","ms","moz"],bd;if(!ao){for(bb=0;bb<be.length;bb++){bd=be[bb];if(Object.prototype.hasOwnProperty.call(d,a0(bd,"hidden"))){if(d[a0(bd,"visibilityState")]==="prerender"){bf=true}break}}}if(bf){t(d,bd+"visibilitychange",function bc(){d.removeEventListener(bd+"visibilitychange",bc,false);
-bg()});return}bg()}function af(bd,bc){var be,bb="(^| )(piwik[_-]"+bc;if(bd){for(be=0;be<bd.length;be++){bb+="|"+bd[be]}}bb+=")( |$)";return new RegExp(bb)}function aV(be,bb,bf){if(!bf){return"link"}var bd=af(aw,"download"),bc=af(ac,"link"),bg=new RegExp("\\.("+ak+")([?&#]|$)","i");return bc.test(be)?"link":(bd.test(be)||bg.test(bb)?"download":0)}function aM(bg){var be,bc,bb;while((be=bg.parentNode)!==null&&b(be)&&((bc=bg.tagName.toUpperCase())!=="A"&&bc!=="AREA")){bg=be}if(b(bg.href)){var bh=bg.hostname||y(bg.href),bi=bh.toLowerCase(),bd=bg.href.replace(bh,bi),bf=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto):","i");if(!bf.test(bd)){bb=aV(bg.className,bd,aE(bi));if(bb){bd=E(bd);aW(bd,bb)}}}}function a9(bb){var bc,bd;bb=bb||H.event;bc=bb.which||bb.button;bd=bb.target||bb.srcElement;if(bb.type==="click"){if(bd){aM(bd)}}else{if(bb.type==="mousedown"){if((bc===1||bc===2)&&bd){ay=bc;W=bd}else{ay=W=null}}else{if(bb.type==="mouseup"){if(bc===ay&&bd===W){aM(bd)}ay=W=null
-}}}}function aL(bc,bb){if(bb){t(bc,"mouseup",a9,false);t(bc,"mousedown",a9,false)}else{t(bc,"click",a9,false)}}function au(bc){if(!aK){aK=true;var bd,bb=af(P,"ignore"),be=d.links;if(be){for(bd=0;bd<be.length;bd++){if(!bb.test(be[bd].className)){aL(be[bd],bc)}}}}}function a4(){var bb,bc,bd={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(j.userAgent))){if(j.mimeTypes&&j.mimeTypes.length){for(bb in bd){if(Object.prototype.hasOwnProperty.call(bd,bb)){bc=j.mimeTypes[bd[bb]];aZ[bb]=(bc&&bc.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&b(j.javaEnabled)&&j.javaEnabled()){aZ.java="1"}if(a(H.GearsFactory)){aZ.gears="1"}aZ.cookie=N()}aZ.res=v.width+"x"+v.height}a4();az();return{getVisitorId:function(){return(J())[1]},getVisitorInfo:function(){return J()
-},getAttributionInfo:function(){return i()},getAttributionCampaignName:function(){return i()[0]},getAttributionCampaignKeyword:function(){return i()[1]},getAttributionReferrerTimestamp:function(){return i()[2]},getAttributionReferrerUrl:function(){return i()[3]},setTrackerUrl:function(bb){L=bb},setSiteId:function(bb){aY=bb},setCustomData:function(bb,bc){if(o(bb)){S=bb}else{if(!S){S=[]}S[bb]=bc}},getCustomData:function(){return S},setCustomVariable:function(bc,bb,bf,bd){var be;if(!b(bd)){bd="visit"}if(bc>0){bb=b(bb)&&!r(bb)?String(bb):bb;bf=b(bf)&&!r(bf)?String(bf):bf;be=[bb.slice(0,a2),bf.slice(0,a2)];if(bd==="visit"||bd===2){K();O[bc]=be}else{if(bd==="page"||bd===3){ax[bc]=be}}}},getCustomVariable:function(bc,bd){var bb;if(!b(bd)){bd="visit"}if(bd==="page"||bd===3){bb=ax[bc]}else{if(bd==="visit"||bd===2){K();bb=O[bc]}}if(!b(bb)||(bb&&bb[0]==="")){return false}return bb},deleteCustomVariable:function(bb,bc){if(this.getCustomVariable(bb,bc)){this.setCustomVariable(bb,"","",bc)}},setLinkTrackingTimer:function(bb){aC=bb
-},setDownloadExtensions:function(bb){ak=bb},addDownloadExtensions:function(bb){ak+="|"+bb},setDomains:function(bb){aD=r(bb)?[bb]:bb;aD.push(aU)},setIgnoreClasses:function(bb){P=r(bb)?[bb]:bb},setRequestMethod:function(bb){aF=bb||"GET"},setReferrerUrl:function(bb){aH=bb},setCustomUrl:function(bb){ar=aT(a8,bb)},setDocumentTitle:function(bb){ai=bb},setDownloadClasses:function(bb){aw=r(bb)?[bb]:bb},setLinkClasses:function(bb){ac=r(bb)?[bb]:bb},setCampaignNameKey:function(bb){am=r(bb)?[bb]:bb},setCampaignKeywordKey:function(bb){ah=r(bb)?[bb]:bb},discardHashTag:function(bb){R=bb},setCookieNamePrefix:function(bb){a6=bb;O=X()},setCookieDomain:function(bb){V=m(bb);az()},setCookiePath:function(bb){a7=bb;az()},setVisitorCookieTimeout:function(bb){aa=bb*1000},setSessionCookieTimeout:function(bb){ab=bb*1000},setReferralCookieTimeout:function(bb){at=bb*1000},setConversionAttributionFirstReferrer:function(bb){aq=bb},disableCookies:function(){T=true;aZ.cookie="0"},setDoNotTrack:function(bc){var bb=j.doNotTrack||j.msDoNotTrack;
-a1=bc&&(bb==="yes"||bb==="1");if(a1){this.disableCookies()}},addListener:function(bc,bb){aL(bc,bb)},enableLinkTracking:function(bb){if(h){au(bb)}else{C.push(function(){au(bb)})}},setHeartBeatTimer:function(bd,bc){var bb=new Date();Q=bb.getTime()+bd*1000;ae=bc*1000},killFrame:function(){if(H.location!==H.top.location){H.top.location=H.location}},redirectFile:function(bb){if(H.location.protocol==="file:"){H.location=bb}},setCountPreRendered:function(bb){ao=bb},trackGoal:function(bb,bd,bc){ag(function(){aA(bb,bd,bc)})},trackLink:function(bc,bb,bd){ag(function(){aW(bc,bb,bd)})},trackPageView:function(bb,bc){ag(function(){av(bb,bc)})},setEcommerceView:function(be,bb,bd,bc){if(!b(bd)||!bd.length){bd=""}else{if(bd instanceof Array){bd=JSON2.stringify(bd)}}ax[5]=["_pkc",bd];if(b(bc)&&String(bc).length){ax[2]=["_pkp",bc]}if((!b(be)||!be.length)&&(!b(bb)||!bb.length)){return}if(b(be)&&be.length){ax[3]=["_pks",be]}if(!b(bb)||!bb.length){bb=""}ax[4]=["_pkn",bb]},addEcommerceItem:function(bf,bb,bd,bc,be){if(bf.length){aN[bf]=[bf,bb,bd,bc,be]
+bg()});return}bg()}function af(bd,bc){var be,bb="(^| )(piwik[_-]"+bc;if(bd){for(be=0;be<bd.length;be++){bb+="|"+bd[be]}}bb+=")( |$)";return new RegExp(bb)}function aV(be,bb,bf){var bd=af(aw,"download"),bc=af(ac,"link"),bg=new RegExp("\\.("+ak+")([?&#]|$)","i");return bc.test(be)?"link":(bd.test(be)||bg.test(bb)?"download":(bf?0:"link"))}function aM(bg){var be,bc,bb;while((be=bg.parentNode)!==null&&b(be)&&((bc=bg.tagName.toUpperCase())!=="A"&&bc!=="AREA")){bg=be}if(b(bg.href)){var bh=bg.hostname||y(bg.href),bi=bh.toLowerCase(),bd=bg.href.replace(bh,bi),bf=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript|mailto):","i");if(!bf.test(bd)){bb=aV(bg.className,bd,aE(bi));if(bb){bd=E(bd);aW(bd,bb)}}}}function a9(bb){var bc,bd;bb=bb||H.event;bc=bb.which||bb.button;bd=bb.target||bb.srcElement;if(bb.type==="click"){if(bd){aM(bd)}}else{if(bb.type==="mousedown"){if((bc===1||bc===2)&&bd){ay=bc;W=bd}else{ay=W=null}}else{if(bb.type==="mouseup"){if(bc===ay&&bd===W){aM(bd)}ay=W=null}}}}function aL(bc,bb){if(bb){t(bc,"mouseup",a9,false);
+t(bc,"mousedown",a9,false)}else{t(bc,"click",a9,false)}}function au(bc){if(!aK){aK=true;var bd,bb=af(P,"ignore"),be=d.links;if(be){for(bd=0;bd<be.length;bd++){if(!bb.test(be[bd].className)){aL(be[bd],bc)}}}}}function a4(){var bb,bc,bd={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(j.userAgent))){if(j.mimeTypes&&j.mimeTypes.length){for(bb in bd){if(Object.prototype.hasOwnProperty.call(bd,bb)){bc=j.mimeTypes[bd[bb]];aZ[bb]=(bc&&bc.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&b(j.javaEnabled)&&j.javaEnabled()){aZ.java="1"}if(a(H.GearsFactory)){aZ.gears="1"}aZ.cookie=N()}aZ.res=v.width+"x"+v.height}a4();az();return{getVisitorId:function(){return(J())[1]},getVisitorInfo:function(){return J()},getAttributionInfo:function(){return i()
+},getAttributionCampaignName:function(){return i()[0]},getAttributionCampaignKeyword:function(){return i()[1]},getAttributionReferrerTimestamp:function(){return i()[2]},getAttributionReferrerUrl:function(){return i()[3]},setTrackerUrl:function(bb){L=bb},setSiteId:function(bb){aY=bb},setCustomData:function(bb,bc){if(o(bb)){S=bb}else{if(!S){S=[]}S[bb]=bc}},getCustomData:function(){return S},setCustomVariable:function(bc,bb,bf,bd){var be;if(!b(bd)){bd="visit"}if(bc>0){bb=b(bb)&&!r(bb)?String(bb):bb;bf=b(bf)&&!r(bf)?String(bf):bf;be=[bb.slice(0,a2),bf.slice(0,a2)];if(bd==="visit"||bd===2){K();O[bc]=be}else{if(bd==="page"||bd===3){ax[bc]=be}}}},getCustomVariable:function(bc,bd){var bb;if(!b(bd)){bd="visit"}if(bd==="page"||bd===3){bb=ax[bc]}else{if(bd==="visit"||bd===2){K();bb=O[bc]}}if(!b(bb)||(bb&&bb[0]==="")){return false}return bb},deleteCustomVariable:function(bb,bc){if(this.getCustomVariable(bb,bc)){this.setCustomVariable(bb,"","",bc)}},setLinkTrackingTimer:function(bb){aC=bb},setDownloadExtensions:function(bb){ak=bb
+},addDownloadExtensions:function(bb){ak+="|"+bb},setDomains:function(bb){aD=r(bb)?[bb]:bb;aD.push(aU)},setIgnoreClasses:function(bb){P=r(bb)?[bb]:bb},setRequestMethod:function(bb){aF=bb||"GET"},setReferrerUrl:function(bb){aH=bb},setCustomUrl:function(bb){ar=aT(a8,bb)},setDocumentTitle:function(bb){ai=bb},setDownloadClasses:function(bb){aw=r(bb)?[bb]:bb},setLinkClasses:function(bb){ac=r(bb)?[bb]:bb},setCampaignNameKey:function(bb){am=r(bb)?[bb]:bb},setCampaignKeywordKey:function(bb){ah=r(bb)?[bb]:bb},discardHashTag:function(bb){R=bb},setCookieNamePrefix:function(bb){a6=bb;O=X()},setCookieDomain:function(bb){V=m(bb);az()},setCookiePath:function(bb){a7=bb;az()},setVisitorCookieTimeout:function(bb){aa=bb*1000},setSessionCookieTimeout:function(bb){ab=bb*1000},setReferralCookieTimeout:function(bb){at=bb*1000},setConversionAttributionFirstReferrer:function(bb){aq=bb},disableCookies:function(){T=true;aZ.cookie="0"},setDoNotTrack:function(bc){var bb=j.doNotTrack||j.msDoNotTrack;a1=bc&&(bb==="yes"||bb==="1");
+if(a1){this.disableCookies()}},addListener:function(bc,bb){aL(bc,bb)},enableLinkTracking:function(bb){if(h){au(bb)}else{C.push(function(){au(bb)})}},setHeartBeatTimer:function(bd,bc){var bb=new Date();Q=bb.getTime()+bd*1000;ae=bc*1000},killFrame:function(){if(H.location!==H.top.location){H.top.location=H.location}},redirectFile:function(bb){if(H.location.protocol==="file:"){H.location=bb}},setCountPreRendered:function(bb){ao=bb},trackGoal:function(bb,bd,bc){ag(function(){aA(bb,bd,bc)})},trackLink:function(bc,bb,bd){ag(function(){aW(bc,bb,bd)})},trackPageView:function(bb,bc){ag(function(){av(bb,bc)})},setEcommerceView:function(be,bb,bd,bc){if(!b(bd)||!bd.length){bd=""}else{if(bd instanceof Array){bd=JSON2.stringify(bd)}}ax[5]=["_pkc",bd];if(b(bc)&&String(bc).length){ax[2]=["_pkp",bc]}if((!b(be)||!be.length)&&(!b(bb)||!bb.length)){return}if(b(be)&&be.length){ax[3]=["_pks",be]}if(!b(bb)||!bb.length){bb=""}ax[4]=["_pkn",bb]},addEcommerceItem:function(bf,bb,bd,bc,be){if(bf.length){aN[bf]=[bf,bb,bd,bc,be]
 }},trackEcommerceOrder:function(bb,bf,be,bd,bc,bg){aR(bb,bf,be,bd,bc,bg)},trackEcommerceCartUpdate:function(bb){a5(bb)}}}function c(){return{push:z}}t(H,"beforeunload",B,false);x();Date.prototype.getTimeAlias=Date.prototype.getTime;G=new F();for(D=0;D<_paq.length;D++){z(_paq[D])}_paq=new c();return{addPlugin:function(i,J){w[i]=J},getTracker:function(i,J){return new F(i,J)},getAsyncTracker:function(){return G}}}()),piwik_track,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