From f109bec92a992852b1023765541ef80b73a1f425 Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Tue, 17 Mar 2015 15:44:21 -0700 Subject: [PATCH] Remove references to unsupported IE6 IE6 is no longer supported in target builds by GWT. Remove the dead code, rename still live IE support to IE8. Change-Id: I8d0f20ee09a687f2692e196d9f25cef928dc3bb4 --- .../java/com/google/gwtexpui/linker/server/UserAgentRule.java | 3 --- gerrit-gwtui/gwt.defs | 2 +- .../src/main/java/com/google/gerrit/UserAgent.gwt.xml | 4 +--- .../src/main/java/com/google/gerrit/client/gerrit.css | 2 +- ...{FancyFlexTableImplIE6.java => FancyFlexTableImplIE8.java} | 2 +- .../java/com/google/gerrit/prettify/PrettyFormatter.gwt.xml | 3 +-- .../{PrivateScopeImplIE6.java => PrivateScopeImplIE8.java} | 4 ++-- 7 files changed, 7 insertions(+), 13 deletions(-) rename gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/{FancyFlexTableImplIE6.java => FancyFlexTableImplIE8.java} (96%) rename gerrit-prettify/src/main/java/com/google/gerrit/prettify/client/{PrivateScopeImplIE6.java => PrivateScopeImplIE8.java} (90%) diff --git a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/linker/server/UserAgentRule.java b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/linker/server/UserAgentRule.java index eb87e7f20e..6c820a8e7f 100644 --- a/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/linker/server/UserAgentRule.java +++ b/gerrit-gwtexpui/src/main/java/com/google/gwtexpui/linker/server/UserAgentRule.java @@ -67,9 +67,6 @@ public class UserAgentRule { if (v >= 8000) { return "ie8"; } - if (v >= 6000) { - return "ie6"; - } } return null; diff --git a/gerrit-gwtui/gwt.defs b/gerrit-gwtui/gwt.defs index cd206c0737..0e5928d546 100644 --- a/gerrit-gwtui/gwt.defs +++ b/gerrit-gwtui/gwt.defs @@ -17,7 +17,7 @@ BROWSERS = [ 'firefox', 'gecko1_8', 'safari', - 'msie', 'ie6', 'ie8', 'ie9', + 'msie', 'ie8', 'ie9', ] ALIASES = { 'chrome': 'safari', diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/UserAgent.gwt.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/UserAgent.gwt.xml index e6f3acb66e..c02518b30e 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/UserAgent.gwt.xml +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/UserAgent.gwt.xml @@ -21,10 +21,9 @@ - + - @@ -32,7 +31,6 @@ - diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css index 9777508c41..7995eeb9ad 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css @@ -354,7 +354,7 @@ a:hover { opacity: 0.80; } } -@if user.agent ie6 ie8 { +@if user.agent ie8 { /* IE just doesn't do opacity the way we want, make our dialog * stand out in a way that it can't be missed against the page */ diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE6.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE8.java similarity index 96% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE6.java rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE8.java index 59feba89fa..76ad0e70b3 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE6.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/FancyFlexTableImplIE8.java @@ -21,7 +21,7 @@ import com.google.gwt.user.client.ui.HTMLTable; import com.google.gwtexpui.safehtml.client.SafeHtml; import com.google.gwtexpui.safehtml.client.SafeHtmlBuilder; -public class FancyFlexTableImplIE6 extends FancyFlexTableImpl { +public class FancyFlexTableImplIE8 extends FancyFlexTableImpl { @Override public void resetHtml(final FlexTable myTable, final SafeHtml bodyHtml) { final Element oldBody = getBodyElement(myTable); diff --git a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/PrettyFormatter.gwt.xml b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/PrettyFormatter.gwt.xml index 48591f8239..fd88f6c385 100644 --- a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/PrettyFormatter.gwt.xml +++ b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/PrettyFormatter.gwt.xml @@ -14,10 +14,9 @@ limitations under the License. --> - + - diff --git a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/client/PrivateScopeImplIE6.java b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/client/PrivateScopeImplIE8.java similarity index 90% rename from gerrit-prettify/src/main/java/com/google/gerrit/prettify/client/PrivateScopeImplIE6.java rename to gerrit-prettify/src/main/java/com/google/gerrit/prettify/client/PrivateScopeImplIE8.java index abb4e15812..0496d916d2 100644 --- a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/client/PrivateScopeImplIE6.java +++ b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/client/PrivateScopeImplIE8.java @@ -16,8 +16,8 @@ package com.google.gerrit.prettify.client; import com.google.gwt.core.client.JavaScriptObject; -/** IE6 requires us to initialize the document before we can use it. */ -public class PrivateScopeImplIE6 extends PrivateScopeImpl { +/** MSIE requires us to initialize the document before we can use it. */ +public class PrivateScopeImplIE8 extends PrivateScopeImpl { private JavaScriptObject context; @Override