From: Benoît Pin Date: Mon, 26 May 2014 12:48:06 +0000 (+0200) Subject: Ajout flag isIE10, isIE11 et isTrident. X-Git-Url: https://scm.cri.ensmp.fr/git/Epoz.git/commitdiff_plain/38932404cd4009792b5064f360cdd101e455064f?ds=sidebyside Ajout flag isIE10, isIE11 et isTrident. Bugfix : isIE fonctionne aussi pour Internet Explorer 11. --- diff --git a/epoz/epoz_core/epoz_script_detect.js.dtml b/epoz/epoz_core/epoz_script_detect.js.dtml index f396f51..816a0a5 100755 --- a/epoz/epoz_core/epoz_script_detect.js.dtml +++ b/epoz/epoz_core/epoz_script_detect.js.dtml @@ -8,8 +8,9 @@ function BrowserDetect() { var ua = navigator.userAgent.toLowerCase(); // browser engine name - this.isGecko = (ua.indexOf('gecko') != -1 && ua.indexOf('safari') == -1); this.isAppleWebKit = (ua.indexOf('applewebkit') != -1); + this.isTrident = (ua.indexOf('trident') != -1); + this.isGecko = (!this.isTrident && (ua.indexOf('gecko') != -1 && ua.indexOf('safari') == -1)); // browser name this.isKonqueror = (ua.indexOf('konqueror') != -1); @@ -18,7 +19,7 @@ function BrowserDetect() { this.isOpera = (ua.indexOf('opera') != -1); this.isIcab = (ua.indexOf('icab') != -1); this.isAol = (ua.indexOf('aol') != -1); - this.isIE = (ua.indexOf('msie') != -1 && !this.isOpera && (ua.indexOf('webtv') == -1) ); + this.isIE = (this.isTrident || ua.indexOf('msie') != -1 && !this.isOpera && (ua.indexOf('webtv') == -1) ); this.isMozilla = (this.isGecko && ua.indexOf('gecko/') + 14 == ua.length); this.isFirebird = (ua.indexOf('firebird/') != -1); this.isFirefox = (ua.indexOf('firefox/') != -1); @@ -44,7 +45,11 @@ function BrowserDetect() { this.versionMinor = parseFloat( ua.substring( ua.indexOf('rv:') + 3 ) ); } else if (this.isIE && this.versionMinor >= 4) { - this.versionMinor = parseFloat( ua.substring( ua.indexOf('msie ') + 5 ) ); + if (ua.indexOf('msie') != -1) { + this.versionMinor = parseFloat( ua.substring( ua.indexOf('msie ') + 5 ) );} + else if (this.isTrident) { + this.versionMinor = parseFloat( ua.substring( ua.indexOf('rv:') + 3 ) ); + } } else if (this.isKonqueror) { this.versionMinor = parseFloat( ua.substring( ua.indexOf('konqueror/') + 10 ) ); @@ -96,6 +101,8 @@ function BrowserDetect() { this.isIE6x = (this.isIE && this.versionMajor == 6); this.isIE6up = (this.isIE && this.versionMajor >= 6); this.isIE8max = (this.isIE && this.versionMajor <= 8); + this.isIE10 = (this.isIE && this.versionMajor == 10); + this.isIE11 = (this.isIE && this.versionMajor == 11); this.isIE4xMac = (this.isIE4x && this.isMac); }