From b4152212b7f3872f0773b72b6af172ab576a2144 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Wed, 13 Jul 2016 03:17:27 +0000
Subject: [PATCH] record actual screen resolution when using JS tracker

---
 js/piwik.js | 9 ++++-----
 piwik.js    | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/js/piwik.js b/js/piwik.js
index df079ddb185..af5dd325c30 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -972,7 +972,7 @@ if (typeof JSON2 !== 'object' && typeof window.JSON === 'object' && window.JSON.
     onload, src,
     min, round, random,
     exec,
-    res, width, height, devicePixelRatio,
+    res, width, height,
     pdf, qt, realp, wma, dir, fla, java, gears, ag,
     hook, getHook, getVisitorId, getVisitorInfo, setUserId, getUserId, setSiteId, getSiteId, setTrackerUrl, getTrackerUrl, appendToTrackingUrl, getRequest, addPlugin,
     getAttributionInfo, getAttributionCampaignName, getAttributionCampaignKeyword,
@@ -5014,8 +5014,7 @@ if (typeof window.Piwik !== 'object') {
                         java: 'application/x-java-vm',
                         gears: 'application/x-googlegears',
                         ag: 'application/x-silverlight'
-                    },
-                    devicePixelRatio = windowAlias.devicePixelRatio || 1;
+                    };
 
                 // detect browser features except IE < 11 (IE 11 user agent is no longer MSIE)
                 if (!((new RegExp('MSIE')).test(navigatorAlias.userAgent))) {
@@ -5046,8 +5045,8 @@ if (typeof window.Piwik !== 'object') {
                     browserFeatures.cookie = hasCookies();
                 }
 
-                var width = parseInt(screenAlias.width, 10) * devicePixelRatio;
-                var height = parseInt(screenAlias.height, 10) * devicePixelRatio;
+                var width = parseInt(screenAlias.width, 10);
+                var height = parseInt(screenAlias.height, 10);
                 browserFeatures.res = parseInt(width, 10) + 'x' + parseInt(height, 10);
             }
 
diff --git a/piwik.js b/piwik.js
index 179f74aacdd..04d80cf92e0 100644
--- a/piwik.js
+++ b/piwik.js
@@ -53,8 +53,8 @@ if(!ay(cA)&&cy.wasContentTargetAttrReplaced){S.setAnyAttribute(cy,p.CONTENT_TARG
 }var cy;for(cy=0;cy<cz.length;cy++){if(!p.isNodeVisible(cz[cy])){cz.splice(cy,1);cy--}}if(!cz||!cz.length){return[]}return bZ(cz)}function al(cA,cy,cz){var cB=p.buildImpressionRequestParams(cA,cy,cz);return bU(cB,null,"contentImpression")}function ct(cB,cz){if(!cB){return}var cy=p.findParentContentNode(cB);var cA=p.buildContentBlock(cy);if(!cA){return}if(!cz){cz="Unknown"}return at(cz,cA.name,cA.piece,cA.target)}function ca(cz,cB,cy,cA){return"e_c="+n(cz)+"&e_a="+n(cB)+(A(cy)?"&e_n="+n(cy):"")+(A(cA)?"&e_v="+n(cA):"")}function ae(cA,cC,cy,cB,cD){if(String(cA).length===0||String(cC).length===0){return false}var cz=bU(ca(cA,cC,cy,cB),cD,"event");ba(cz,bd)}function bC(cy,cB,cz,cC){var cA=bU("search="+n(cy)+(cB?"&search_cat="+n(cB):"")+(A(cz)?"&search_count="+cz:""),cC,"sitesearch");ba(cA,bd)}function ce(cy,cB,cA){var cz=bU("idgoal="+cy+(cB?"&revenue="+cB:""),cA,"goal");ba(cz,bd)}function cl(cB,cy,cF,cE,cA){var cD=cy+"="+n(bv(cB));var cz=bW(cA,"click",cB);if(cz){cD+="&"+cz}var cC=bU(cD,cF,"link");
 ba(cC,(cE?0:bd),cE)}function bm(cz,cy){if(cz!==""){return cz+cy.charAt(0).toUpperCase()+cy.slice(1)}return cy}function bK(cD){var cC,cy,cB=["","webkit","ms","moz"],cA;if(!aQ){for(cy=0;cy<cB.length;cy++){cA=cB[cy];if(Object.prototype.hasOwnProperty.call(x,bm(cA,"hidden"))){if(x[bm(cA,"visibilityState")]==="prerender"){cC=true}break}}}if(cC){X(x,cA+"visibilitychange",function cz(){x.removeEventListener(cA+"visibilitychange",cz,false);cD()});return}cD()}function ao(cy){if(x.readyState==="complete"){cy()}else{if(K.addEventListener){K.addEventListener("load",cy)}else{if(K.attachEvent){K.attachEvent("onload",cy)}}}}function aO(cB){var cy=false;if(x.attachEvent){cy=x.readyState==="complete"}else{cy=x.readyState!=="loading"}if(cy){cB();return}var cA;if(x.addEventListener){X(x,"DOMContentLoaded",function cz(){x.removeEventListener("DOMContentLoaded",cz,false);if(!cy){cy=true;cB()}})}else{if(x.attachEvent){x.attachEvent("onreadystatechange",function cz(){if(x.readyState==="complete"){x.detachEvent("onreadystatechange",cz);
 if(!cy){cy=true;cB()}}});if(x.documentElement.doScroll&&K===K.top){(function cz(){if(!cy){try{x.documentElement.doScroll("left")}catch(cC){setTimeout(cz,0);return}cy=true;cB()}}())}}}X(K,"load",function(){if(!cy){cy=true;cB()}},false)}function b5(cy){var cz=cs(cy);if(cz&&cz.type){cz.href=k(cz.href);cl(cz.href,cz.type,undefined,null,cy)}}function bY(){return x.all&&!x.addEventListener}function cg(cy){var cA=cy.which;var cz=(typeof cy.button);if(!cA&&cz!=="undefined"){if(bY()){if(cy.button&1){cA=1}else{if(cy.button&2){cA=3}else{if(cy.button&4){cA=2}}}}else{if(cy.button===0||cy.button==="0"){cA=1}else{if(cy.button&1){cA=2}else{if(cy.button&2){cA=3}}}}}return cA}function bn(cy){switch(cg(cy)){case 1:return"left";case 2:return"middle";case 3:return"right"}}function aE(cy){return cy.target||cy.srcElement}function ah(cy){return function(cB){cB=cB||K.event;var cA=bn(cB);var cC=aE(cB);if(cB.type==="click"){var cz=false;if(cy&&cA==="middle"){cz=true}if(cC&&!cz){b5(cC)}}else{if(cB.type==="mousedown"){if(cA==="middle"&&cC){av=cA;
-a7=cC}else{av=a7=null}}else{if(cB.type==="mouseup"){if(cA===av&&cC===a7){b5(cC)}av=a7=null}else{if(cB.type==="contextmenu"){b5(cC)}}}}}}function ab(cz,cy){X(cz,"click",ah(cy),false);if(cy){X(cz,"mouseup",ah(cy),false);X(cz,"mousedown",ah(cy),false);X(cz,"contextmenu",ah(cy),false)}}function a8(cz){if(!aa){aa=true;var cA,cy=aD(a6,"ignore"),cB=x.links;if(cB){for(cA=0;cA<cB.length;cA++){if(!cy.test(cB[cA].className)){ab(cB[cA],cz)}}}}}function aw(cA,cC,cD){if(bI){return true}bI=true;var cE=false;var cB,cz;function cy(){cE=true}ao(function(){function cF(cH){setTimeout(function(){if(!bI){return}cE=false;cD.trackVisibleContentImpressions();cF(cH)},cH)}function cG(cH){setTimeout(function(){if(!bI){return}if(cE){cE=false;cD.trackVisibleContentImpressions()}cG(cH)},cH)}if(cA){cB=["scroll","resize"];for(cz=0;cz<cB.length;cz++){if(x.addEventListener){x.addEventListener(cB[cz],cy)}else{K.attachEvent("on"+cB[cz],cy)}}cG(100)}if(cC&&cC>0){cC=parseInt(cC,10);cF(cC)}})}function b3(){var cA,cC,cD={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"},cz=K.devicePixelRatio||1;
-if(!((new RegExp("MSIE")).test(f.userAgent))){if(f.mimeTypes&&f.mimeTypes.length){for(cA in cD){if(Object.prototype.hasOwnProperty.call(cD,cA)){cC=f.mimeTypes[cD[cA]];cp[cA]=(cC&&cC.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&A(f.javaEnabled)&&f.javaEnabled()){cp.java="1"}if(s(K.GearsFactory)){cp.gears="1"}cp.cookie=by()}var cB=parseInt(O.width,10)*cz;var cy=parseInt(O.height,10)*cz;cp.res=parseInt(cB,10)+"x"+parseInt(cy,10)}b3();aR();ap();return{getVisitorId:function(){return aB().uuid},getVisitorInfo:function(){return b9()},getAttributionInfo:function(){return bg()},getAttributionCampaignName:function(){return bg()[0]},getAttributionCampaignKeyword:function(){return bg()[1]},getAttributionReferrerTimestamp:function(){return bg()[2]},getAttributionReferrerUrl:function(){return bg()[3]},setTrackerUrl:function(cy){aj=cy},getTrackerUrl:function(){return aj},addTracker:function(cy,cA){if(!cA){throw new Error("A siteId must be given to add a new tracker")}if(!A(cy)||null===cy){cy=this.getTrackerUrl()
+a7=cC}else{av=a7=null}}else{if(cB.type==="mouseup"){if(cA===av&&cC===a7){b5(cC)}av=a7=null}else{if(cB.type==="contextmenu"){b5(cC)}}}}}}function ab(cz,cy){X(cz,"click",ah(cy),false);if(cy){X(cz,"mouseup",ah(cy),false);X(cz,"mousedown",ah(cy),false);X(cz,"contextmenu",ah(cy),false)}}function a8(cz){if(!aa){aa=true;var cA,cy=aD(a6,"ignore"),cB=x.links;if(cB){for(cA=0;cA<cB.length;cA++){if(!cy.test(cB[cA].className)){ab(cB[cA],cz)}}}}}function aw(cA,cC,cD){if(bI){return true}bI=true;var cE=false;var cB,cz;function cy(){cE=true}ao(function(){function cF(cH){setTimeout(function(){if(!bI){return}cE=false;cD.trackVisibleContentImpressions();cF(cH)},cH)}function cG(cH){setTimeout(function(){if(!bI){return}if(cE){cE=false;cD.trackVisibleContentImpressions()}cG(cH)},cH)}if(cA){cB=["scroll","resize"];for(cz=0;cz<cB.length;cz++){if(x.addEventListener){x.addEventListener(cB[cz],cy)}else{K.attachEvent("on"+cB[cz],cy)}}cG(100)}if(cC&&cC>0){cC=parseInt(cC,10);cF(cC)}})}function b3(){var cz,cB,cC={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(f.userAgent))){if(f.mimeTypes&&f.mimeTypes.length){for(cz in cC){if(Object.prototype.hasOwnProperty.call(cC,cz)){cB=f.mimeTypes[cC[cz]];cp[cz]=(cB&&cB.enabledPlugin)?"1":"0"}}}if(typeof navigator.javaEnabled!=="unknown"&&A(f.javaEnabled)&&f.javaEnabled()){cp.java="1"}if(s(K.GearsFactory)){cp.gears="1"}cp.cookie=by()}var cA=parseInt(O.width,10);var cy=parseInt(O.height,10);cp.res=parseInt(cA,10)+"x"+parseInt(cy,10)}b3();aR();ap();return{getVisitorId:function(){return aB().uuid},getVisitorInfo:function(){return b9()},getAttributionInfo:function(){return bg()},getAttributionCampaignName:function(){return bg()[0]},getAttributionCampaignKeyword:function(){return bg()[1]},getAttributionReferrerTimestamp:function(){return bg()[2]},getAttributionReferrerUrl:function(){return bg()[3]},setTrackerUrl:function(cy){aj=cy},getTrackerUrl:function(){return aj},addTracker:function(cy,cA){if(!cA){throw new Error("A siteId must be given to add a new tracker")}if(!A(cy)||null===cy){cy=this.getTrackerUrl()
 }var cz=new H(cy,cA);z.push(cz);return cz},getSiteId:function(){return bz},setSiteId:function(cy){bw(cy)},setUserId:function(cy){if(!A(cy)||!cy.length){return}a5=cy;bi=bA(a5).substr(0,16)},getUserId:function(){return a5},setCustomData:function(cy,cz){if(N(cy)){Z=cy}else{if(!Z){Z={}}Z[cy]=cz}},getCustomData:function(){return Z},setCustomRequestProcessing:function(cy){bE=cy},appendToTrackingUrl:function(cy){cj=cy},getRequest:function(cy){return bU(cy)},addPlugin:function(cy,cz){a[cy]=cz},setCustomDimension:function(cy,cz){cy=parseInt(cy,10);if(cy>0){if(!A(cz)){cz=""}if(!q(cz)){cz=String(cz)}aV[cy]=cz}},getCustomDimension:function(cy){cy=parseInt(cy,10);if(cy>0&&Object.prototype.hasOwnProperty.call(aV,cy)){return aV[cy]}},deleteCustomDimension:function(cy){cy=parseInt(cy,10);if(cy>0){delete aV[cy]}},setCustomVariable:function(cz,cy,cC,cA){var cB;if(!A(cA)){cA="visit"}if(!A(cy)){return}if(!A(cC)){cC=""}if(cz>0){cy=!q(cy)?String(cy):cy;cC=!q(cC)?String(cC):cC;cB=[cy.slice(0,a1),cC.slice(0,a1)];
 if(cA==="visit"||cA===2){b2();au[cz]=cB}else{if(cA==="page"||cA===3){bp[cz]=cB}else{if(cA==="event"){bO[cz]=cB}}}}},getCustomVariable:function(cz,cA){var cy;if(!A(cA)){cA="visit"}if(cA==="page"||cA===3){cy=bp[cz]}else{if(cA==="event"){cy=bO[cz]}else{if(cA==="visit"||cA===2){b2();cy=au[cz]}}}if(!A(cy)||(cy&&cy[0]==="")){return false}return cy},deleteCustomVariable:function(cy,cz){if(this.getCustomVariable(cy,cz)){this.setCustomVariable(cy,"","",cz)}},storeCustomVariablesInCookie:function(){bk=true},setLinkTrackingTimer:function(cy){bd=cy},setDownloadExtensions:function(cy){if(q(cy)){cy=cy.split("|")}co=cy},addDownloadExtensions:function(cz){var cy;if(q(cz)){cz=cz.split("|")}for(cy=0;cy<cz.length;cy++){co.push(cz[cy])}},removeDownloadExtensions:function(cA){var cz,cy=[];if(q(cA)){cA=cA.split("|")}for(cz=0;cz<co.length;cz++){if(D(cA,co[cz])===-1){cy.push(co[cz])}}co=cy},setDomains:function(cy){af=q(cy)?[cy]:cy;var cA=false,cz;for(cz in af){if(Object.prototype.hasOwnProperty.call(af,cz)&&b4(cf,C(String(af[cz])))){cA=true
 }}if(!cA){af.push(cf)}},setIgnoreClasses:function(cy){a6=q(cy)?[cy]:cy},setRequestMethod:function(cy){cr=cy||bL},setRequestContentType:function(cy){bX=cy||an},setReferrerUrl:function(cy){aW=cy},setCustomUrl:function(cy){aH=bo(bh,cy)},setDocumentTitle:function(cy){aS=cy},setAPIUrl:function(cy){bc=cy},setDownloadClasses:function(cy){bf=q(cy)?[cy]:cy},setLinkClasses:function(cy){aK=q(cy)?[cy]:cy},setCampaignNameKey:function(cy){bT=q(cy)?[cy]:cy},setCampaignKeywordKey:function(cy){bb=q(cy)?[cy]:cy},discardHashTag:function(cy){bj=cy},setCookieNamePrefix:function(cy){aT=cy;au=bq()},setCookieDomain:function(cy){var cz=C(cy);if(a3(cz)){ch=cz;aR()}},setCookiePath:function(cy){aY=cy;aR()},setVisitorCookieTimeout:function(cy){b7=cy*1000},setSessionCookieTimeout:function(cy){bR=cy*1000},setReferralCookieTimeout:function(cy){cn=cy*1000},setConversionAttributionFirstReferrer:function(cy){a2=cy},disableCookies:function(){aU=true;cp.cookie="0";if(bz){ak()}},deleteCookies:function(){ak()},setDoNotTrack:function(cz){var cy=f.doNotTrack||f.msDoNotTrack;