diff options
| -rw-r--r-- | program/js/common.js | 38 |
1 files changed, 17 insertions, 21 deletions
diff --git a/program/js/common.js b/program/js/common.js index 32f6e4c79..14091463f 100644 --- a/program/js/common.js +++ b/program/js/common.js @@ -49,22 +49,23 @@ function roundcube_browser() this.dom = document.getElementById ? true : false; this.dom2 = document.addEventListener && document.removeEventListener; - this.ie = document.all && !window.opera; - this.ie4 = this.ie && !this.dom; - this.ie5 = this.dom && this.appver.indexOf('MSIE 5') > 0; - this.ie8 = this.dom && this.appver.indexOf('MSIE 8') > 0; - this.ie9 = this.dom && this.appver.indexOf('MSIE 9') > 0; - this.ie7 = this.dom && this.appver.indexOf('MSIE 7') > 0; - this.ie6 = this.dom && !this.ie8 && !this.ie7 && this.appver.indexOf('MSIE 6') > 0; - - this.ns = (this.ver < 5 && this.name == 'Netscape') || (this.ver >= 5 && this.vendor.indexOf('Netscape') >= 0); - this.chrome = !this.ie && this.agent_lc.indexOf('chrome') > 0; - this.safari = !this.chrome && (this.agent_lc.indexOf('safari') > 0 || this.agent_lc.indexOf('applewebkit') > 0); - this.konq = this.agent_lc.indexOf('konqueror') > 0; - this.mz = this.dom && !this.ie && !this.ns && !this.chrome && !this.safari && !this.konq && this.agent.indexOf('Mozilla') >= 0; - this.iphone = this.safari && (this.agent_lc.indexOf('iphone') > 0 || this.agent_lc.indexOf('ipod') > 0); - this.ipad = this.safari && this.agent_lc.indexOf('ipad') > 0; - this.opera = window.opera ? true : false; + this.ie = (document.all && !window.opera) || (this.win && this.agent_lc.indexOf('trident/') > 0); + + if (this.ie) { + this.ie6 = this.appver.indexOf('MSIE 6') > 0; + this.ie7 = this.appver.indexOf('MSIE 7') > 0; + this.ie8 = this.appver.indexOf('MSIE 8') > 0; + this.ie9 = this.appver.indexOf('MSIE 9') > 0; + } + else { + this.chrome = this.agent_lc.indexOf('chrome') > 0; + this.safari = !this.chrome && (this.agent_lc.indexOf('safari') > 0 || this.agent_lc.indexOf('applewebkit') > 0); + this.konq = this.agent_lc.indexOf('konqueror') > 0; + this.mz = this.dom && !this.chrome && !this.safari && !this.konq && this.agent.indexOf('Mozilla') >= 0; + this.iphone = this.safari && (this.agent_lc.indexOf('iphone') > 0 || this.agent_lc.indexOf('ipod') > 0); + this.ipad = this.safari && this.agent_lc.indexOf('ipad') > 0; + this.opera = window.opera ? true : false; + } if (!this.vendver) { // common version strings @@ -82,11 +83,6 @@ function roundcube_browser() this.tablet = /ipad|android|xoom|sch-i800|playbook|tablet|kindle/i.test(this.agent_lc); this.mobile = /iphone|ipod|blackberry|iemobile|opera mini|opera mobi|mobile/i.test(this.agent_lc); this.touch = this.mobile || this.tablet; - this.dhtml = (this.ie4 && this.win) || this.ie5 || this.ie6 || this.ns || this.mz; - this.vml = this.win && this.ie && this.dom && !this.opera; - this.pngalpha = this.mz || (this.opera && this.vendver >= 6) || (this.ie && this.mac && this.vendver >= 5) || - (this.ie && this.win && this.vendver >= 5.5) || this.safari; - this.opacity = this.mz || (this.ie && this.vendver >= 5.5 && !this.opera) || (this.safari && this.vendver >= 100); this.cookies = n.cookieEnabled; // test for XMLHTTP support |