From: Benoît Pin <pin@cri.ensmp.fr>
Date: Tue, 31 Mar 2015 13:19:52 +0000 (+0200)
Subject: Retrait de navigateurs obsolètes. Ajout Chrome.
X-Git-Url: https://svn.cri.ensmp.fr/git/Epoz.git/commitdiff_plain/9ca457e332095702cb113e3096d2d74075073e9f?ds=sidebyside;hp=36a8f50734b56b213436c3f09afc80509c20cc16

Retrait de navigateurs obsolètes. Ajout Chrome.
---

diff --git a/Products/Epoz/epoz/epoz_core/epoz_script_detect.js.dtml b/Products/Epoz/epoz/epoz_core/epoz_script_detect.js.dtml
index 3d9216d..a9c44e7 100644
--- a/Products/Epoz/epoz/epoz_core/epoz_script_detect.js.dtml
+++ b/Products/Epoz/epoz/epoz_core/epoz_script_detect.js.dtml
@@ -1,9 +1,10 @@
 // Browser Detect  v2.1.6
-// documentation: http://www.dithered.com/javascript/browser_detect/index.html
 // license: http://creativecommons.org/licenses/by/1.0/
 // code by Chris Nott (chris[at]dithered[dot]com)
+// updated by Benoît Pin
 
-
+var browser;
+(function() {
 function BrowserDetect() {
    var ua = navigator.userAgent.toLowerCase(); 
 
@@ -17,17 +18,11 @@ function BrowserDetect() {
    this.isSafari      = (ua.indexOf('safari') != - 1);
    this.isOmniweb     = (ua.indexOf('omniweb') != - 1);
    this.isOpera       = (ua.indexOf('opera') != -1); 
-   this.isIcab        = (ua.indexOf('icab') != -1); 
-   this.isAol         = (ua.indexOf('aol') != -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);
-   this.isNS          = ( (this.isGecko) ? (ua.indexOf('netscape') != -1) : ( (ua.indexOf('mozilla') != -1) && !this.isOpera && !this.isSafari && (ua.indexOf('spoofer') == -1) && (ua.indexOf('compatible') == -1) && (ua.indexOf('webtv') == -1) && (ua.indexOf('hotjava') == -1) ) );
-   
-   // spoofing and compatible browsers
-   this.isIECompatible = ( (ua.indexOf('msie') != -1) && !this.isIE);
-   this.isNSCompatible = ( (ua.indexOf('mozilla') != -1) && !this.isNS && !this.isMozilla);
+   this.isChrome      = (ua.indexOf('chrome/') != -1);
    
    // rendering engine versions
    this.geckoVersion = ( (this.isGecko) ? ua.substring( (ua.lastIndexOf('gecko/') + 6), (ua.lastIndexOf('gecko/') + 14) ) : -1 );
@@ -38,34 +33,24 @@ function BrowserDetect() {
    this.versionMinor = parseFloat(navigator.appVersion); 
    
    // correct version number
-   if (this.isGecko && !this.isMozilla) {
+   if (this.isGecko && !this.isMozilla)
       this.versionMinor = parseFloat( ua.substring( ua.indexOf('/', ua.indexOf('gecko/') + 6) + 1 ) );
-   }
-   else if (this.isMozilla) {
+   else if (this.isMozilla)
       this.versionMinor = parseFloat( ua.substring( ua.indexOf('rv:') + 3 ) );
-   }
    else if (this.isIE && this.versionMinor >= 4) {
-       if (ua.indexOf('msie') != -1) {
-           this.versionMinor = parseFloat( ua.substring( ua.indexOf('msie ') + 5 ) );}
-       else if (this.isTrident) {
+       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) {
+   else if (this.isKonqueror)
       this.versionMinor = parseFloat( ua.substring( ua.indexOf('konqueror/') + 10 ) );
-   }
-   else if (this.isSafari) {
+   else if (this.isSafari)
       this.versionMinor = parseFloat( ua.substring( ua.lastIndexOf('safari/') + 7 ) );
-   }
-   else if (this.isOmniweb) {
-      this.versionMinor = parseFloat( ua.substring( ua.lastIndexOf('omniweb/') + 8 ) );
-   }
-   else if (this.isOpera) {
+   else if (this.isOpera)
       this.versionMinor = parseFloat( ua.substring( ua.indexOf('opera') + 6 ) );
-   }
-   else if (this.isIcab) {
-      this.versionMinor = parseFloat( ua.substring( ua.indexOf('icab') + 5 ) );
-   }
+   else if(this.isChrome)
+	   this.versionMinor = parseFloat( ua.substring( ua.lastIndexOf('chrome/') + 7 ) );
    
    this.versionMajor = parseInt(this.versionMinor); 
    
@@ -80,25 +65,11 @@ function BrowserDetect() {
    this.isWin    = (ua.indexOf('win') != -1);
    this.isWin32  = (this.isWin && ( ua.indexOf('95') != -1 || ua.indexOf('98') != -1 || ua.indexOf('nt') != -1 || ua.indexOf('win32') != -1 || ua.indexOf('32bit') != -1 || ua.indexOf('xp') != -1) );
    this.isMac    = (ua.indexOf('mac') != -1);
-   this.isUnix   = (ua.indexOf('unix') != -1 || ua.indexOf('sunos') != -1 || ua.indexOf('bsd') != -1 || ua.indexOf('x11') != -1)
+   this.isUnix   = (ua.indexOf('unix') != -1 || ua.indexOf('sunos') != -1 || ua.indexOf('bsd') != -1 || ua.indexOf('x11') != -1);
    this.isLinux  = (ua.indexOf('linux') != -1);
    this.isMobile   = (ua.indexOf('mobile') != -1);
    
    // specific browser shortcuts
-   this.isNS4x = (this.isNS && this.versionMajor == 4);
-   this.isNS40x = (this.isNS4x && this.versionMinor < 4.5);
-   this.isNS47x = (this.isNS4x && this.versionMinor >= 4.7);
-   this.isNS4up = (this.isNS && this.versionMinor >= 4);
-   this.isNS6x = (this.isNS && this.versionMajor == 6);
-   this.isNS6up = (this.isNS && this.versionMajor >= 6);
-   this.isNS7x = (this.isNS && this.versionMajor == 7);
-   this.isNS7up = (this.isNS && this.versionMajor >= 7);
-   
-   this.isIE4x = (this.isIE && this.versionMajor == 4);
-   this.isIE4up = (this.isIE && this.versionMajor >= 4);
-   this.isIE5x = (this.isIE && this.versionMajor == 5);
-   this.isIE55 = (this.isIE && this.versionMinor == 5.5);
-   this.isIE5up = (this.isIE && this.versionMajor >= 5);
    this.isIE6x = (this.isIE && this.versionMajor == 6);
    this.isIE6up = (this.isIE && this.versionMajor >= 6);
    this.isIE7max = (this.isIE && this.versionMajor <= 7);
@@ -107,6 +78,6 @@ function BrowserDetect() {
    this.isIE10max = (this.isIE && this.versionMajor <= 10);
    this.isIE11 = (this.isIE && this.versionMajor == 11);
    
-   this.isIE4xMac = (this.isIE4x && this.isMac);
 }
-var browser = new BrowserDetect();
\ No newline at end of file
+browser = new BrowserDetect();
+}());
\ No newline at end of file