Note that the order of enums matter as the script selection is based on running * these predicates in order and matching the first one that returns {@code true}. - *
Also note that, {@code docMode < 11} in predicates for older IEs exists to - * ensures we never choose them for IE11 (we know that they will not work for IE11). */ private enum UserAgent { safari("return (ua.indexOf('webkit') != -1);"), - gecko1_8("return (ua.indexOf('gecko') != -1 || docMode >= 11);"); + gecko1_8("return (ua.indexOf('gecko') != -1);"); private final String predicateBlock; @@ -70,7 +68,6 @@ static void writeUserAgentPropertyJavaScript(SourceWriter body, // write preamble body.println("var ua = navigator.userAgent.toLowerCase();"); - body.println("var docMode = $doc.documentMode;"); for (UserAgent userAgent : UserAgent.values()) { // write only selected user agents diff --git a/user/super/com/google/gwt/emul/java/lang/Throwable.java b/user/super/com/google/gwt/emul/java/lang/Throwable.java index 1492bb0f003..dca97d0ca14 100644 --- a/user/super/com/google/gwt/emul/java/lang/Throwable.java +++ b/user/super/com/google/gwt/emul/java/lang/Throwable.java @@ -141,16 +141,11 @@ private void setBackingJsObject(Object backingJsObject) { } private native void linkBack(Object error) /*-{ - if (error instanceof Object) { try { // This may throw exception in strict mode. error.__java$exception = this; - if (navigator.userAgent.toLowerCase().indexOf("msie") != -1 && $doc.documentMode < 9) { - return; - } - var throwable = this; Object.defineProperties(error, { cause: { diff --git a/user/test/com/google/gwt/dom/client/ElementTest.java b/user/test/com/google/gwt/dom/client/ElementTest.java index 717448b7a9b..b476824733f 100644 --- a/user/test/com/google/gwt/dom/client/ElementTest.java +++ b/user/test/com/google/gwt/dom/client/ElementTest.java @@ -282,17 +282,10 @@ public void execute() { assertEquals(absLeft, elem.getAbsoluteLeft()); assertEquals(absTop, elem.getAbsoluteTop()); - if (isIE6or7() && !doc.isCSS1Compat()) { - // In IE/quirk, the interior decorations are considered part of the - // width/height, so there's no need to account for them here. - assertEquals(absLeft + width, elem.getAbsoluteRight()); - assertEquals(absTop + height, elem.getAbsoluteBottom()); - } else { - assertEquals(absLeft + width + interiorDecorations, - elem.getAbsoluteRight()); - assertEquals(absTop + height + interiorDecorations, - elem.getAbsoluteBottom()); - } + assertEquals(absLeft + width + interiorDecorations, + elem.getAbsoluteRight()); + assertEquals(absTop + height + interiorDecorations, + elem.getAbsoluteBottom()); } }); } @@ -338,12 +331,8 @@ public void testGetAbsolutePositionWhenBodyScrolled() { // Ensure that the 'position:fixed' div's absolute position includes the // body's scroll position. - // - // Don't do this on IE6/7, which doesn't support position:fixed. - if (!isIE6or7()) { - assertTrue(fixedDiv.getAbsoluteLeft() >= body.getScrollLeft()); - assertTrue(fixedDiv.getAbsoluteTop() >= body.getScrollTop()); - } + assertTrue(fixedDiv.getAbsoluteLeft() >= body.getScrollLeft()); + assertTrue(fixedDiv.getAbsoluteTop() >= body.getScrollTop()); } /** @@ -751,16 +740,4 @@ public void testStyleCamelCase() { private native JavaScriptObject createTrivialJSO() /*-{ return {}; }-*/; - - // Stolen from UserAgentPropertyGenerator - private native boolean isIE6or7() /*-{ - var ua = navigator.userAgent.toLowerCase(); - if (ua.indexOf("msie") != -1) { - if ($doc.documentMode >= 8) { - return false; - } - return true; - } - return false; - }-*/; } diff --git a/user/test/com/google/gwt/http/client/RequestBuilderTest.java b/user/test/com/google/gwt/http/client/RequestBuilderTest.java index 5eeb801bcbe..ca84829ca46 100644 --- a/user/test/com/google/gwt/http/client/RequestBuilderTest.java +++ b/user/test/com/google/gwt/http/client/RequestBuilderTest.java @@ -35,15 +35,6 @@ private static String getTestBaseURL() { return GWT.getModuleBaseURL() + "testRequestBuilder/"; } - /** - * HACK: Part of a work around for IE's failure to throw an exception when an - * XmlHttpRequest that violates the same origin policy is made. - */ - private static native boolean isIE() /*-{ - var ua = navigator.userAgent.toLowerCase(); - return ua.indexOf("msie") != -1; - }-*/; - /** * HACK: Part of a work around for Safari 2.0.4's failure to throw an * exception when an XmlHttpRequest that violates the same origin policy is @@ -138,7 +129,7 @@ public void onResponseReceived(Request request, Response response) { } }); - if (isIE() || isSafari() || isFirefox35()) { + if (isSafari() || isFirefox35()) { /* * HACK: Safari 2.0.4 will not throw an exception for XHR's that violate * the same-origin policy. It appears to silently ignore them so we do diff --git a/user/test/com/google/gwt/typedarrays/client/ClientSupportTest.java b/user/test/com/google/gwt/typedarrays/client/ClientSupportTest.java index 8033fc93f90..d34fed20613 100644 --- a/user/test/com/google/gwt/typedarrays/client/ClientSupportTest.java +++ b/user/test/com/google/gwt/typedarrays/client/ClientSupportTest.java @@ -32,16 +32,6 @@ public String getModuleName() { public void testSupported() { boolean isSupported = TypedArrays.isSupported(); String ua = getUserAgent(); - if (ua.contains("msie")) { - if (getIeDocumentMode() <= 9) { - assertFalse("IE9 and below do not support typed array", isSupported); - } else { - // TODO(dankurka) change this once we get type array support in for ie10 - assertFalse("IE10 does support typed array, but GWT still uses old implementation", - isSupported); - } - return; - } if (ua.contains("firefox/")) { int idx = ua.indexOf("firefox/") + 8; int endIdx = idx; @@ -60,12 +50,6 @@ public void testSupported() { return; } - // IE11 - choosing the gecko permutation - if (ua.contains("trident/7.0")) { - assertTrue(isSupported); - return; - } - assertFalse("Unknown browser (" + ua + ") assumed not to support typed arrays", isSupported); } @@ -74,7 +58,4 @@ private static native String getUserAgent() /*-{ return navigator.userAgent.toLowerCase(); }-*/; - private static native int getIeDocumentMode() /*-{ - return $doc.documentMode || 0; - }-*/; }