Skip to content

Commit 5cfafd0

Browse files
author
zhourenjian
committed
Support IE 9.0 detection
1 parent fcec4fe commit 5cfafd0

File tree

1 file changed

+18
-16
lines changed
  • sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/browser

1 file changed

+18
-16
lines changed

‎sources/net.sf.j2s.java.org.eclipse.swt/src/org/eclipse/swt/internal/browser/OS.java‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ private OS() {
3333

3434
public static boolean isIE = false;
3535

36+
public static boolean isIE90 = false;
3637
public static boolean isIE80 = false;
3738
public static boolean isIE70 = false;
3839
public static boolean isIE60 = false;
@@ -73,26 +74,26 @@ private OS() {
7374
* @j2sNative
7475
var os = $wt.internal.browser.OS;
7576
var dua = navigator.userAgent;
76-
var dav = navigator.appVersion;
77-
os.isOpera = dua.indexOf("Opera") >= 0;
78-
var isKHTML = (dav.indexOf("Konqueror") >= 0)||(dav.indexOf("Safari") >= 0);
79-
os.isSafari = dav.indexOf("Safari") >= 0;
80-
os.isChrome = dav.indexOf("Chrome") >= 0;
81-
os.isChrome10 = dav.indexOf("Chrome/1.") >= 0 || dav.indexOf("Chrome/0.") >= 0;
82-
os.isChrome20 = dav.indexOf("Chrome/2.") >= 0;
83-
os.isChrome30 = dav.indexOf("Chrome/3.") >= 0;
84-
var geckoPos = dua.indexOf("Gecko");
85-
os.isMozilla = (geckoPos >= 0)&&(!isKHTML);
77+
os.isOpera = dua.indexOf ("Opera") >= 0;
78+
var isKHTML = dua.indexOf ("Konqueror") >= 0 || dua.indexOf ("Safari") >= 0;
79+
os.isSafari = dua.indexOf ("Safari") >= 0;
80+
os.isChrome = dua.indexOf ("Chrome") >= 0;
81+
os.isChrome10 = dua.indexOf ("Chrome/1.") >= 0 || dua.indexOf ("Chrome/0.") >= 0;
82+
os.isChrome20 = dua.indexOf ("Chrome/2.") >= 0;
83+
os.isChrome30 = dua.indexOf ("Chrome/3.") >= 0;
84+
var geckoPos = dua.indexOf ("Gecko");
85+
os.isMozilla = geckoPos >= 0 && !isKHTML;
8686
os.isFirefox = os.isMozilla && dua.indexOf ("Firefox") != -1;
8787
os.isFirefox10 = os.isFirefox && (dua.indexOf ("Firefox/1.") != -1 || dua.indexOf ("Firefox/0.") != -1);
8888
os.isFirefox20 = os.isFirefox && dua.indexOf ("Firefox/2.") != -1;
8989
os.isFirefox30 = os.isFirefox && dua.indexOf ("Firefox/3.") != -1;
90-
os.isIE = (document.all!=null)&&(!os.isOpera);
91-
os.isIE50 = os.isIE && dav.indexOf("MSIE 5.0")>=0;
92-
os.isIE55 = os.isIE && dav.indexOf("MSIE 5.5")>=0;
93-
os.isIE60 = os.isIE && dav.indexOf("MSIE 6.0")>=0;
94-
os.isIE70 = os.isIE && dav.indexOf("MSIE 7.0")>=0;
95-
os.isIE80 = os.isIE && dav.indexOf("MSIE 8.0")>=0;
90+
os.isIE = document.all != null && !os.isOpera;
91+
os.isIE50 = os.isIE && dua.indexOf("MSIE 5.0")>=0;
92+
os.isIE55 = os.isIE && dua.indexOf("MSIE 5.5")>=0;
93+
os.isIE60 = os.isIE && dua.indexOf("MSIE 6.0")>=0;
94+
os.isIE70 = os.isIE && dua.indexOf("MSIE 7.0")>=0;
95+
os.isIE80 = os.isIE && dua.indexOf("MSIE 8.0")>=0;
96+
os.isIE90 = os.isIE && dua.indexOf("MSIE 9.0")>=0;
9697
os.isIENeedPNGFix = os.isIE50 || os.isIE55 || os.isIE60;
9798
os.noReturnCallback = os.noReturnCallbackFunction;
9899
*/
@@ -177,6 +178,7 @@ public static void SetWindowPos(Object handle, int x, int y, int w, int h, int f
177178
private static void init() {
178179
if (invisibleContainer == null) {
179180
Element el = document.createElement ("DIV");
181+
el.id = "swt-invisible-container";
180182
document.body.appendChild (el);
181183
CSSStyle s = el.style;
182184
s.position = "absolute";

0 commit comments

Comments
 (0)