From 0ae5709ac934ec50b6895cfca1621e76b3a429d6 Mon Sep 17 00:00:00 2001 From: Eric Bollens Date: Fri, 31 Aug 2012 18:19:56 -0700 Subject: [PATCH] Android screen dimensions always return false in mwf.screen [fixes #157] --- root/assets/js/core/screen.js | 2 +- root/assets/js/core/screen.src.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/root/assets/js/core/screen.js b/root/assets/js/core/screen.js index ec81cecf..aa6820f4 100644 --- a/root/assets/js/core/screen.js +++ b/root/assets/js/core/screen.js @@ -1 +1 @@ -mwf.screen=new function(){this.cookieName=mwf.site.cookie.prefix+"screen";var b=window.screen;var a=mwf.userAgent.getOSVersion();if(mwf.userAgent.getOS()=="android"&&(a.indexOf("2.2")==0||a.indexOf("2.3")==0)){b={width:false,height:false}}this.getWidth=function(){return typeof b.width!=="undefined"?b.width:mwf.browser.getWidth()};this.getHeight=function(){return typeof b.height!=="undefined"?b.height:mwf.browser.getHeight()};this.getPixelRatio=function(){return(typeof window.devicePixelRatio!="undefined"&&window.devicePixelRatio)?window.devicePixelRatio:1};this.generateCookieContent=function(){return'{"h":"'+this.getHeight()+'","w":"'+this.getWidth()+'","r":"'+this.getPixelRatio()+'"}'}}; \ No newline at end of file +mwf.screen=new function(){this.cookieName=mwf.site.cookie.prefix+"screen";var b=window.screen;var a=mwf.userAgent.getOSVersion();if(mwf.userAgent.getOS()=="android"){b={width:false,height:false}}this.getWidth=function(){return typeof b.width!=="undefined"?b.width:mwf.browser.getWidth()};this.getHeight=function(){return typeof b.height!=="undefined"?b.height:mwf.browser.getHeight()};this.getPixelRatio=function(){return(typeof window.devicePixelRatio!="undefined"&&window.devicePixelRatio)?window.devicePixelRatio:1};this.generateCookieContent=function(){return'{"h":"'+this.getHeight()+'","w":"'+this.getWidth()+'","r":"'+this.getPixelRatio()+'"}'}}; \ No newline at end of file diff --git a/root/assets/js/core/screen.src.js b/root/assets/js/core/screen.src.js index e145dd74..460965e2 100644 --- a/root/assets/js/core/screen.src.js +++ b/root/assets/js/core/screen.src.js @@ -24,13 +24,13 @@ mwf.screen = new function() { var ws = window.screen; /** - * Bug in Android 2.2-3 prevents it from returning accurate screen + * Bug in Android prevent it from returning accurate screen * dimensions, so bypass inaccurate values with false instead. * - * @compat Android 2.2-3 + * @compat Android */ var version = mwf.userAgent.getOSVersion(); - if(mwf.userAgent.getOS() == 'android' && (version.indexOf('2.2') == 0 || version.indexOf('2.3') == 0)) { + if(mwf.userAgent.getOS() == 'android') { ws = {width:false,height:false} }