fix killFrame where IE might continuously reload the page (this might be because I'm running different versions of IE in a VM)

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

1 files changed, 2 insertions, 2 deletions

diff --git a/piwik.js b/piwik.js
index b848dff657..b080984cd9 100644
--- a/piwik.js
+++ b/piwik.js
@@ -20,5 +20,5 @@ for(bb in al){aT+="&"+bb+"="+al[bb]}if(bd){aT+="&data="+e(JSON2.stringify(bd))}e
 aM(aU,Z)}function ar(aU,aT){var aV,aS="(^| )(piwik[_-]"+aT;if(aU){for(aV=0;aV<aU.length;aV++){aS+="|"+aU[aV]}}aS+=")( |$)";return new RegExp(aS)}function aO(aV,aS,aW){if(!aW){return"link"}var aU=ar(aC,"download"),aT=ar(aF,"link"),aX=new RegExp("\\.("+af+")([?&#]|$)","i");return aT.test(aV)?"link":(aU.test(aV)||aX.test(aS)?"download":0)}function S(aX){var aV,aT,aS;while(!!(aV=aX.parentNode)&&((aT=aX.tagName)!=="A"&&aT!=="AREA")){aX=aV}if(b(aX.href)){var aY=aX.hostname||y(aX.href),aZ=aY.toLowerCase(),aU=aX.href.replace(aY,aZ),aW=new RegExp("^(javascript|vbscript|jscript|mocha|livescript|ecmascript):","i");if(!aW.test(aU)){aS=aO(aX.className,aU,ao(aZ));if(aS){ae(aU,aS)}}}}function ab(aS){var aT,aU;aS=aS||G.event;aT=aS.which||aS.button;aU=aS.target||aS.srcElement;if(aS.type==="click"){if(aU){S(aU)}}else{if(aS.type==="mousedown"){if((aT===1||aT===2)&&aU){aN=aT;an=aU}else{aN=an=null}}else{if(aS.type==="mouseup"){if(aT===aN&&aU===an){S(aU)}aN=an=null}}}}function aH(aT,aS){if(aS){t(aT,"mouseup",ab,false);
 t(aT,"mousedown",ab,false)}else{t(aT,"click",ab,false)}}function am(aT){if(!ap){ap=true;var aU,aS=ar(M,"ignore"),aV=d.links;if(aV){for(aU=0;aU<aV.length;aU++){if(!aS.test(aV[aU].className)){aH(aV[aU],aT)}}}}}function ac(){var aS,aT,aU={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(j.mimeTypes&&j.mimeTypes.length){for(aS in aU){aT=j.mimeTypes[aU[aS]];al[aS]=(aT&&aT.enabledPlugin)?"1":"0"}}if(typeof navigator.javaEnabled!=="unknown"&&b(j.javaEnabled)&&j.javaEnabled()){al.java="1"}if(a(G.GearsFactory)){al.gears="1"}al.res=v.width+"x"+v.height;al.cookie=at()}ac();ag();return{getVisitorId:function(){return(aA())[1]},setTrackerUrl:function(aS){aa=aS},setSiteId:function(aS){aQ=aS},setCustomData:function(aS,aT){if(n(aS)){au=aS}else{if(!au){au=[]}au[aS]=aT}},getCustomData:function(){return au
 },setCustomVariable:function(aT,aS,aU){aE();if(aT>0&&aT<=5){aG[aT]=[aS.slice(0,R),aU.slice(0,R)]}},getCustomVariable:function(aT){var aS;aE();aS=aG[aT];if(aS&&aS[0]===""){return}return aG[aT]},deleteCustomVariable:function(aS){if(this.getCustomVariable(aS)){this.setCustomVariable(aS,"","")}},setLinkTrackingTimer:function(aS){Z=aS},setDownloadExtensions:function(aS){af=aS},addDownloadExtensions:function(aS){af+="|"+aS},setDomains:function(aS){aB=q(aS)?[aS]:aS;aB.push(W)},setIgnoreClasses:function(aS){M=q(aS)?[aS]:aS},setRequestMethod:function(aS){K=aS||"GET"},setReferrerUrl:function(aS){az=aS},setCustomUrl:function(aS){aJ=aS},setDocumentTitle:function(aS){aP=aS},setDownloadClasses:function(aS){aC=q(aS)?[aS]:aS},setLinkClasses:function(aS){aF=q(aS)?[aS]:aS},discardHashTag:function(aS){ai=aS},setCookieNamePrefix:function(aS){aD=aS;aG=U()},setCookieDomain:function(aS){P=l(aS);ag()},setCookiePath:function(aS){ax=aS;ag()},setVisitorCookieTimeout:function(aS){aR=aS*1000},setSessionCookieTimeout:function(aS){ad=aS*1000
-},setReferralCookieTimeout:function(aS){Y=aS*1000},setConversionAttributionFirstReferrer:function(aS){aq=aS},setDoNotTrack:function(aS){L=aS&&j.doNotTrack},addListener:function(aT,aS){aH(aT,aS)},enableLinkTracking:function(aS){if(h){am(aS)}else{B.push(function(){am(aS)})}},setHeartBeatTimer:function(aU,aT){var aS=new Date();J=aS.getTime()+aU*1000;ah=aT*1000},killFrame:function(){if(G!==G.top){G.top.location=G.location}},redirectFile:function(aS){if(G.location.protocol==="file:"){G.location=aS}},trackGoal:function(aS,aU,aT){aL(aS,aU,aT)},trackLink:function(aT,aS,aU){ae(aT,aS,aU)},trackPageView:function(aS,aT){I(aS,aT)}}}function c(){return{push:z}}t(G,"beforeunload",A,false);x();F=new D();for(C=0;C<_paq.length;C++){z(_paq[C])}_paq=new c();return{addPlugin:function(i,I){w[i]=I},getTracker:function(i,I){return new D(i,I)},getAsyncTracker:function(){return F}}}()),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);if(!!(c=a("tracker_pause"))){e.setLinkTrackingTimer(c)}if(!!(c=a("download_extensions"))){e.setDownloadExtensions(c)}if(!!(c=a("hosts_alias"))){e.setDomains(c)}if(!!(c=a("ignore_classes"))){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
+},setReferralCookieTimeout:function(aS){Y=aS*1000},setConversionAttributionFirstReferrer:function(aS){aq=aS},setDoNotTrack:function(aS){L=aS&&j.doNotTrack},addListener:function(aT,aS){aH(aT,aS)},enableLinkTracking:function(aS){if(h){am(aS)}else{B.push(function(){am(aS)})}},setHeartBeatTimer:function(aU,aT){var aS=new Date();J=aS.getTime()+aU*1000;ah=aT*1000},killFrame:function(){if(G.location!==G.top.location){G.top.location=G.location}},redirectFile:function(aS){if(G.location.protocol==="file:"){G.location=aS}},trackGoal:function(aS,aU,aT){aL(aS,aU,aT)},trackLink:function(aT,aS,aU){ae(aT,aS,aU)},trackPageView:function(aS,aT){I(aS,aT)}}}function c(){return{push:z}}t(G,"beforeunload",A,false);x();F=new D();for(C=0;C<_paq.length;C++){z(_paq[C])}_paq=new c();return{addPlugin:function(i,I){w[i]=I},getTracker:function(i,I){return new D(i,I)},getAsyncTracker:function(){return F}}}()),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);if(!!(c=a("tracker_pause"))){e.setLinkTrackingTimer(c)}if(!!(c=a("download_extensions"))){e.setDownloadExtensions(c)}if(!!(c=a("hosts_alias"))){e.setDomains(c)}if(!!(c=a("ignore_classes"))){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