X-Git-Url: https://scm.cri.ensmp.fr/git/Epoz.git/blobdiff_plain/5451e113f280352326e894c187844ea5d79ce008..cedf075cd0c3917856e5fab0c19a7c5067333950:/epoz/epoz_core/epoz_script_detect.js.dtml

diff --git a/epoz/epoz_core/epoz_script_detect.js.dtml b/epoz/epoz_core/epoz_script_detect.js.dtml
index e29479e..275ffb9 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 ) );
@@ -95,6 +100,10 @@ function BrowserDetect() {
    this.isIE5up = (this.isIE && this.versionMajor >= 5);
    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.isIE10max = (this.isIE && this.versionMajor <= 10);
+   this.isIE11 = (this.isIE && this.versionMajor == 11);
    
    this.isIE4xMac = (this.isIE4x && this.isMac);
 }