Index: trunk/kernel/admin_templates/incs/is.js =================================================================== diff -u -r1566 -r2596 --- trunk/kernel/admin_templates/incs/is.js (.../is.js) (revision 1566) +++ trunk/kernel/admin_templates/incs/is.js (.../is.js) (revision 2596) @@ -2,7 +2,7 @@ // (C) Netscape Communications 1999. Permission granted to reuse and distribute. // Revised 17 May 99 to add is.nav5up and is.ie5up (see below). // Revised 21 Nov 00 to add is.gecko and is.ie5_5 Also Changed is.nav5 and is.nav5up to is.nav6 and is.nav6up -// Revised 22 Feb 01 to correct Javascript Detection for IE 5.x, Opera 4, +// Revised 22 Feb 01 to correct Javascript Detection for IE 5.x, Opera 4, // correct Opera 5 detection // add support for winME and win2k // synch with browser-type-oo.js @@ -18,7 +18,7 @@ // is.major (integer indicating major version number: 2, 3, 4 ...) // is.minor (float indicating full version number: 2.02, 3.01, 4.04 ...) // (3) browser vendor AND major version number -// is.nav2, is.nav3, is.nav4, is.nav4up, is.nav6, is.nav6up, is.gecko, is.ie3, +// is.nav2, is.nav3, is.nav4, is.nav4up, is.nav6, is.nav6up, is.gecko, is.ie3, // is.ie4, is.ie4up, is.ie5, is.ie5up, is.ie5_5, is.ie5_5up, is.ie6, is.ie6up, is.hotjava3, is.hotjava3up // (4) JavaScript version number: // is.js (float indicating full JavaScript version number: 1, 1.1, 1.2 ...) @@ -71,7 +71,6 @@ this.nav6up = (this.nav && (this.major >= 5)); this.gecko = (agt.indexOf('gecko') != -1); - this.ie = ((agt.indexOf("msie") != -1) && (agt.indexOf("opera") == -1)); this.ie3 = (this.ie && (this.major < 4)); this.ie4 = (this.ie && (this.major == 4) && (agt.indexOf("msie 4")!=-1) ); @@ -99,9 +98,9 @@ this.opera5 = (agt.indexOf("opera 5") != -1 || agt.indexOf("opera/5") != -1); this.opera5up = (this.opera && !this.opera2 && !this.opera3 && !this.opera4); - this.webtv = (agt.indexOf("webtv") != -1); + this.webtv = (agt.indexOf("webtv") != -1); - this.TVNavigator = ((agt.indexOf("navio") != -1) || (agt.indexOf("navio_aoltv") != -1)); + this.TVNavigator = ((agt.indexOf("navio") != -1) || (agt.indexOf("navio_aoltv") != -1)); this.AOLTV = this.TVNavigator; this.hotjava = (agt.indexOf("hotjava") != -1); @@ -136,9 +135,9 @@ this.win95 = ((agt.indexOf("win95")!=-1) || (agt.indexOf("windows 95")!=-1)); // is this a 16 bit compiled version? - this.win16 = ((agt.indexOf("win16")!=-1) || - (agt.indexOf("16bit")!=-1) || (agt.indexOf("windows 3.1")!=-1) || - (agt.indexOf("windows 16-bit")!=-1) ); + this.win16 = ((agt.indexOf("win16")!=-1) || + (agt.indexOf("16bit")!=-1) || (agt.indexOf("windows 3.1")!=-1) || + (agt.indexOf("windows 16-bit")!=-1) ); this.win31 = ((agt.indexOf("windows 3.1")!=-1) || (agt.indexOf("win16")!=-1) || (agt.indexOf("windows 16-bit")!=-1)); @@ -149,23 +148,23 @@ // the 16-bit version running on Win98 will still return "Win95". this.win98 = ((agt.indexOf("win98")!=-1) || (agt.indexOf("windows 98")!=-1)); this.winnt = ((agt.indexOf("winnt")!=-1) || (agt.indexOf("windows nt")!=-1)); - this.win32 = (this.win95 || this.winnt || this.win98 || + this.win32 = (this.win95 || this.winnt || this.win98 || ((this.major >= 4) && (navigator.platform == "Win32")) || (agt.indexOf("win32")!=-1) || (agt.indexOf("32bit")!=-1)); this.winme = ((agt.indexOf("win 9x 4.90")!=-1)); this.win2k = ((agt.indexOf("windows nt 5.0")!=-1)); - this.os2 = ((agt.indexOf("os/2")!=-1) || - (navigator.appVersion.indexOf("OS/2")!=-1) || + this.os2 = ((agt.indexOf("os/2")!=-1) || + (navigator.appVersion.indexOf("OS/2")!=-1) || (agt.indexOf("ibm-webexplorer")!=-1)); this.mac = (agt.indexOf("mac")!=-1); // hack ie5 js version for mac if (this.mac && this.ie5up) this.js = 1.4; - this.mac68k = (this.mac && ((agt.indexOf("68k")!=-1) || + this.mac68k = (this.mac && ((agt.indexOf("68k")!=-1) || (agt.indexOf("68000")!=-1))); - this.macppc = (this.mac && ((agt.indexOf("ppc")!=-1) || + this.macppc = (this.mac && ((agt.indexOf("ppc")!=-1) || (agt.indexOf("powerpc")!=-1))); this.sun = (agt.indexOf("sunos")!=-1); @@ -179,23 +178,23 @@ this.hpux9 = (this.hpux && (agt.indexOf("09.")!=-1)); this.hpux10= (this.hpux && (agt.indexOf("10.")!=-1)); this.aix = (agt.indexOf("aix") !=-1); // IBM - this.aix1 = (agt.indexOf("aix 1") !=-1); - this.aix2 = (agt.indexOf("aix 2") !=-1); - this.aix3 = (agt.indexOf("aix 3") !=-1); - this.aix4 = (agt.indexOf("aix 4") !=-1); + this.aix1 = (agt.indexOf("aix 1") !=-1); + this.aix2 = (agt.indexOf("aix 2") !=-1); + this.aix3 = (agt.indexOf("aix 3") !=-1); + this.aix4 = (agt.indexOf("aix 4") !=-1); this.linux = (agt.indexOf("inux")!=-1); this.sco = (agt.indexOf("sco")!=-1) || (agt.indexOf("unix_sv")!=-1); - this.unixware = (agt.indexOf("unix_system_v")!=-1); - this.mpras = (agt.indexOf("ncr")!=-1); + this.unixware = (agt.indexOf("unix_system_v")!=-1); + this.mpras = (agt.indexOf("ncr")!=-1); this.reliant = (agt.indexOf("reliantunix")!=-1); - this.dec = ((agt.indexOf("dec")!=-1) || (agt.indexOf("osf1")!=-1) || - (agt.indexOf("dec_alpha")!=-1) || (agt.indexOf("alphaserver")!=-1) || - (agt.indexOf("ultrix")!=-1) || (agt.indexOf("alphastation")!=-1)); + this.dec = ((agt.indexOf("dec")!=-1) || (agt.indexOf("osf1")!=-1) || + (agt.indexOf("dec_alpha")!=-1) || (agt.indexOf("alphaserver")!=-1) || + (agt.indexOf("ultrix")!=-1) || (agt.indexOf("alphastation")!=-1)); this.sinix = (agt.indexOf("sinix")!=-1); this.freebsd = (agt.indexOf("freebsd")!=-1); this.bsd = (agt.indexOf("bsd")!=-1); - this.unix = ((agt.indexOf("x11")!=-1) || this.sun || this.irix || this.hpux || - this.sco ||this.unixware || this.mpras || this.reliant || + this.unix = ((agt.indexOf("x11")!=-1) || this.sun || this.irix || this.hpux || + this.sco ||this.unixware || this.mpras || this.reliant || this.dec || this.sinix || this.aix || this.linux || this.bsd || this.freebsd); this.vms = ((agt.indexOf("vax")!=-1) || (agt.indexOf("openvms")!=-1)); @@ -205,7 +204,7 @@ var isIE3Mac = false; // this section is designed specifically for IE3 for the Mac -if ((navigator.appVersion.indexOf("Mac")!=-1) && (navigator.userAgent.indexOf("MSIE")!=-1) && +if ((navigator.appVersion.indexOf("Mac")!=-1) && (navigator.userAgent.indexOf("MSIE")!=-1) && (parseInt(navigator.appVersion)==3)) isIE3Mac = true; else is = new Is();