Removed all rebind rules involving IE6, related classes
Change-Id: I2010f66513c3add20c1d10af852215f0fab57686
diff --git a/tools/api-checker/config/gwt26_27userApi.conf b/tools/api-checker/config/gwt26_27userApi.conf
index 83c2c6a..f1497d5 100644
--- a/tools/api-checker/config/gwt26_27userApi.conf
+++ b/tools/api-checker/config/gwt26_27userApi.conf
@@ -202,3 +202,5 @@
# Removed legacy browsers implementation of typed arrays.
com.google.gwt.typedarrays.client.NativeImplEmulDataView MISSING
+# Renaming IE6-specific impl classes
+com.google.gwt.user.client.ui.TreeItem.TreeItemImplIE6 MISSING
diff --git a/user/src/com/google/gwt/event/dom/DragEvent.gwt.xml b/user/src/com/google/gwt/event/dom/DragEvent.gwt.xml
index 199429b..d43b7b6 100644
--- a/user/src/com/google/gwt/event/dom/DragEvent.gwt.xml
+++ b/user/src/com/google/gwt/event/dom/DragEvent.gwt.xml
@@ -24,10 +24,7 @@
<!-- Older browsers do not support drag events. -->
<set-property name="dragEventSupport" value="no">
- <any>
- <when-property-is name="user.agent" value="ie6" />
- <when-property-is name="user.agent" value="ie8" />
- </any>
+ <when-property-is name="user.agent" value="ie8" />
</set-property>
<replace-with class="com.google.gwt.event.dom.client.DragDropEventBase.DragSupportDetectorNo">
diff --git a/user/src/com/google/gwt/event/dom/TouchEvent.gwt.xml b/user/src/com/google/gwt/event/dom/TouchEvent.gwt.xml
index 2227242..1585b88 100644
--- a/user/src/com/google/gwt/event/dom/TouchEvent.gwt.xml
+++ b/user/src/com/google/gwt/event/dom/TouchEvent.gwt.xml
@@ -25,7 +25,9 @@
<!-- Older browsers do not support touch events. -->
<set-property name="touchEventSupport" value="no">
<any>
- <when-property-is name="user.agent" value="ie6" />
+ <when-property-is name="user.agent" value="ie8" />
+ <when-property-is name="user.agent" value="ie9" />
+ <when-property-is name="user.agent" value="ie10" />
</any>
</set-property>
diff --git a/user/src/com/google/gwt/layout/Layout.gwt.xml b/user/src/com/google/gwt/layout/Layout.gwt.xml
index 7676a55..a4b6c92 100644
--- a/user/src/com/google/gwt/layout/Layout.gwt.xml
+++ b/user/src/com/google/gwt/layout/Layout.gwt.xml
@@ -25,9 +25,9 @@
<when-type-is class="com.google.gwt.layout.client.LayoutImpl"/>
<any>
<when-property-is name="user.agent" value="ie8"/>
- <!-- IE9 is only bound explicitly to the IE6 impl because leaving -->
+ <!-- IE9 is only bound explicitly to the IE8 impl because leaving -->
<!-- it unbound leads to a warning when compiling. If attempting -->
- <!-- to let IE9 use a non-IE6 impl, explicitly bind it to avoid -->
+ <!-- to let IE9 use a non-IE8 impl, explicitly bind it to avoid -->
<!-- this warning -->
<when-property-is name="user.agent" value="ie9"/>
</any>
diff --git a/user/src/com/google/gwt/resources/Resources.gwt.xml b/user/src/com/google/gwt/resources/Resources.gwt.xml
index 2581227..13b814b 100644
--- a/user/src/com/google/gwt/resources/Resources.gwt.xml
+++ b/user/src/com/google/gwt/resources/Resources.gwt.xml
@@ -42,21 +42,12 @@
<!-- Last-matches wins, so this will selectively override the previous rule -->
<generate-with
class="com.google.gwt.resources.rebind.context.InlineClientBundleGenerator">
+ <!-- Is inlining enabled? -->
+ <when-property-is name="ClientBundle.enableInlining" value="true" />
- <!-- We have a number of conditions that must be satisfied -->
- <all>
- <!-- Is inlining enabled? -->
- <when-property-is name="ClientBundle.enableInlining" value="true" />
-
- <!-- Again, it's necessary to specify which types the generator runs on -->
- <when-type-assignable
- class="com.google.gwt.resources.client.ClientBundle" />
-
- <!-- Ancient browsers support RFC 2397 data: URLs -->
- <none>
- <when-property-is name="user.agent" value="ie6" />
- </none>
- </all>
+ <!-- Again, it's necessary to specify which types the generator runs on -->
+ <when-type-assignable
+ class="com.google.gwt.resources.client.ClientBundle" />
</generate-with>
<!-- This can be used to disable the use of strongly-named files -->
diff --git a/user/src/com/google/gwt/safecss/SafeCss.gwt.xml b/user/src/com/google/gwt/safecss/SafeCss.gwt.xml
index dfcb5cf..72ecde6 100644
--- a/user/src/com/google/gwt/safecss/SafeCss.gwt.xml
+++ b/user/src/com/google/gwt/safecss/SafeCss.gwt.xml
@@ -21,12 +21,9 @@
<inherits name="com.google.gwt.dom.DOM" />
<inherits name="com.google.gwt.useragent.UserAgent"/>
- <replace-with class="com.google.gwt.safecss.shared.SafeStylesUtils.ImplIE6To8">
+ <replace-with class="com.google.gwt.safecss.shared.SafeStylesUtils.ImplIE8">
<when-type-is class="com.google.gwt.safecss.shared.SafeStylesUtils.Impl" />
- <any>
- <when-property-is name="user.agent" value="ie6" />
- <when-property-is name="user.agent" value="ie8" />
- </any>
+ <when-property-is name="user.agent" value="ie8" />
</replace-with>
<!-- Override IE9 fallback. -->
diff --git a/user/src/com/google/gwt/safecss/shared/SafeStylesUtils.java b/user/src/com/google/gwt/safecss/shared/SafeStylesUtils.java
index 80404b3..831a31e 100644
--- a/user/src/com/google/gwt/safecss/shared/SafeStylesUtils.java
+++ b/user/src/com/google/gwt/safecss/shared/SafeStylesUtils.java
@@ -63,7 +63,7 @@
*/
static class ImplServer extends Impl {
- private ImplIE6To8 implIE = new ImplIE6To8();
+ private ImplIE8 implIE = new ImplIE8();
@Override
public SafeStyles forOpacity(double value) {
@@ -75,12 +75,12 @@
}
/**
- * IE6-IE8 implementation of this class.
+ * IE8 implementation of this class.
*/
- static class ImplIE6To8 extends Impl {
+ static class ImplIE8 extends Impl {
@Override
public SafeStyles forOpacity(double value) {
- // IE6-IE8 uses an alpha filter instead of opacity.
+ // IE8 uses an alpha filter instead of opacity.
return new SafeStylesString("filter: alpha(opacity=" + (value * 100) + ");");
}
}
diff --git a/user/src/com/google/gwt/user/DOM.gwt.xml b/user/src/com/google/gwt/user/DOM.gwt.xml
index 36b4fc5..7abccfe 100644
--- a/user/src/com/google/gwt/user/DOM.gwt.xml
+++ b/user/src/com/google/gwt/user/DOM.gwt.xml
@@ -59,11 +59,6 @@
<when-property-is name="user.agent" value="ie8"/>
</replace-with>
- <replace-with class="com.google.gwt.user.client.impl.DOMImplIE6">
- <when-type-is class="com.google.gwt.user.client.impl.DOMImpl"/>
- <when-property-is name="user.agent" value="ie6"/>
- </replace-with>
-
<replace-with class="com.google.gwt.user.client.impl.DOMImplMozilla">
<when-type-is class="com.google.gwt.user.client.impl.DOMImpl"/>
<when-property-is name="user.agent" value="gecko1_8"/>
diff --git a/user/src/com/google/gwt/user/Focus.gwt.xml b/user/src/com/google/gwt/user/Focus.gwt.xml
index 4da2f9e..6b31305 100644
--- a/user/src/com/google/gwt/user/Focus.gwt.xml
+++ b/user/src/com/google/gwt/user/Focus.gwt.xml
@@ -37,11 +37,10 @@
<replace-with class="com.google.gwt.user.client.ui.impl.FocusImplIE6">
<when-type-is class="com.google.gwt.user.client.ui.impl.FocusImpl"/>
<any>
- <when-property-is name="user.agent" value="ie6"/>
<when-property-is name="user.agent" value="ie8"/>
- <!-- IE9 is only bound explicitly to the IE6 impl because leaving -->
+ <!-- IE9 is only bound explicitly to the IE8 impl because leaving -->
<!-- it unbound leads to a warning when compiling. If attempting -->
- <!-- to let IE9 use a non-IE6 impl, explicitly bind it to avoid -->
+ <!-- to let IE9 use a non-IE8 impl, explicitly bind it to avoid -->
<!-- this warning -->
<when-property-is name="user.agent" value="ie9"/>
</any>
diff --git a/user/src/com/google/gwt/user/Form.gwt.xml b/user/src/com/google/gwt/user/Form.gwt.xml
index ddb1491..a11d968 100644
--- a/user/src/com/google/gwt/user/Form.gwt.xml
+++ b/user/src/com/google/gwt/user/Form.gwt.xml
@@ -25,11 +25,8 @@
<when-type-is class="com.google.gwt.user.client.ui.impl.FormPanelImpl"/>
</replace-with>
- <replace-with class="com.google.gwt.user.client.ui.impl.FormPanelImplIE6">
+ <replace-with class="com.google.gwt.user.client.ui.impl.FormPanelImplIE8">
<when-type-is class="com.google.gwt.user.client.ui.impl.FormPanelImpl"/>
- <any>
- <when-property-is name="user.agent" value="ie6"/>
- <when-property-is name="user.agent" value="ie8"/>
- </any>
+ <when-property-is name="user.agent" value="ie8"/>
</replace-with>
</module>
diff --git a/user/src/com/google/gwt/user/HTMLTable.gwt.xml b/user/src/com/google/gwt/user/HTMLTable.gwt.xml
index be6b3cf..0e2ddce 100644
--- a/user/src/com/google/gwt/user/HTMLTable.gwt.xml
+++ b/user/src/com/google/gwt/user/HTMLTable.gwt.xml
@@ -29,7 +29,6 @@
<replace-with class="com.google.gwt.user.client.ui.HTMLTable.HTMLTableIEImpl">
<when-type-is class="com.google.gwt.user.client.ui.HTMLTable.HTMLTableImpl"/>
<any>
- <when-property-is name="user.agent" value="ie6"/>
<when-property-is name="user.agent" value="ie8"/>
<when-property-is name="user.agent" value="ie9"/>
</any>
diff --git a/user/src/com/google/gwt/user/Hyperlink.gwt.xml b/user/src/com/google/gwt/user/Hyperlink.gwt.xml
index 36ef9ad..9447380 100644
--- a/user/src/com/google/gwt/user/Hyperlink.gwt.xml
+++ b/user/src/com/google/gwt/user/Hyperlink.gwt.xml
@@ -10,7 +10,6 @@
<replace-with class="com.google.gwt.user.client.ui.impl.HyperlinkImplIE">
<when-type-is class="com.google.gwt.user.client.ui.impl.HyperlinkImpl"/>
<any>
- <when-property-is name="user.agent" value="ie6"/>
<when-property-is name="user.agent" value="ie8"/>
<when-property-is name="user.agent" value="ie9" />
</any>
diff --git a/user/src/com/google/gwt/user/Popup.gwt.xml b/user/src/com/google/gwt/user/Popup.gwt.xml
index 9adf27b..6ebc545 100644
--- a/user/src/com/google/gwt/user/Popup.gwt.xml
+++ b/user/src/com/google/gwt/user/Popup.gwt.xml
@@ -25,11 +25,4 @@
<when-type-is class="com.google.gwt.user.client.ui.impl.PopupImpl"/>
<when-property-is name="user.agent" value="gecko1_8"/>
</replace-with>
-
- <!-- IE6 has a completely different popup implementation. It is no longer -->
- <!-- necessary on IE8. -->
- <replace-with class="com.google.gwt.user.client.ui.impl.PopupImplIE6">
- <when-type-is class="com.google.gwt.user.client.ui.impl.PopupImpl"/>
- <when-property-is name="user.agent" value="ie6"/>
- </replace-with>
</module>
diff --git a/user/src/com/google/gwt/user/ResizeLayoutPanel.gwt.xml b/user/src/com/google/gwt/user/ResizeLayoutPanel.gwt.xml
index 5df7dda..694e99c 100644
--- a/user/src/com/google/gwt/user/ResizeLayoutPanel.gwt.xml
+++ b/user/src/com/google/gwt/user/ResizeLayoutPanel.gwt.xml
@@ -33,10 +33,4 @@
<when-property-is name="user.agent" value="ie9"/>
</any>
</replace-with>
-
- <!-- IE6 needs to be kicked to render correctly. -->
- <replace-with class="com.google.gwt.user.client.ui.ResizeLayoutPanel.ImplIE6">
- <when-type-is class="com.google.gwt.user.client.ui.ResizeLayoutPanel.Impl"/>
- <when-property-is name="user.agent" value="ie6"/>
- </replace-with>
</module>
diff --git a/user/src/com/google/gwt/user/RichText.gwt.xml b/user/src/com/google/gwt/user/RichText.gwt.xml
index 94b5571..b86c5dd 100644
--- a/user/src/com/google/gwt/user/RichText.gwt.xml
+++ b/user/src/com/google/gwt/user/RichText.gwt.xml
@@ -20,11 +20,10 @@
<!-- IE-specific implementation -->
<replace-with
- class="com.google.gwt.user.client.ui.impl.RichTextAreaImplIE6">
+ class="com.google.gwt.user.client.ui.impl.RichTextAreaImplIE8toIE10">
<when-type-is
class="com.google.gwt.user.client.ui.impl.RichTextAreaImpl" />
<any>
- <when-property-is name="user.agent" value="ie6" />
<when-property-is name="user.agent" value="ie8" />
<when-property-is name="user.agent" value="ie9" />
<when-property-is name="user.agent" value="ie10" />
diff --git a/user/src/com/google/gwt/user/Scroll.gwt.xml b/user/src/com/google/gwt/user/Scroll.gwt.xml
index edd2df1..3992bcb 100644
--- a/user/src/com/google/gwt/user/Scroll.gwt.xml
+++ b/user/src/com/google/gwt/user/Scroll.gwt.xml
@@ -19,7 +19,6 @@
<replace-with class="com.google.gwt.user.client.ui.ScrollImpl.ScrollImplTrident">
<when-type-is class="com.google.gwt.user.client.ui.ScrollImpl"/>
<any>
- <when-property-is name="user.agent" value="ie6"/>
<when-property-is name="user.agent" value="ie8"/>
<when-property-is name="user.agent" value="ie9"/>
</any>
diff --git a/user/src/com/google/gwt/user/SplitPanel.gwt.xml b/user/src/com/google/gwt/user/SplitPanel.gwt.xml
index 6ec767d..8b61af1 100644
--- a/user/src/com/google/gwt/user/SplitPanel.gwt.xml
+++ b/user/src/com/google/gwt/user/SplitPanel.gwt.xml
@@ -19,28 +19,22 @@
<when-type-is class="com.google.gwt.user.client.ui.HorizontalSplitPanel.Impl"/>
</replace-with>
- <replace-with class="com.google.gwt.user.client.ui.HorizontalSplitPanel.ImplIE6">
+ <replace-with class="com.google.gwt.user.client.ui.HorizontalSplitPanel.ImplIE8">
<when-type-is class="com.google.gwt.user.client.ui.HorizontalSplitPanel.Impl"/>
- <any>
- <when-property-is name="user.agent" value="ie6"/>
- <when-property-is name="user.agent" value="ie8"/>
- </any>
+ <when-property-is name="user.agent" value="ie8"/>
</replace-with>
<replace-with class="com.google.gwt.user.client.ui.HorizontalSplitPanel.ImplSafari">
<when-type-is class="com.google.gwt.user.client.ui.HorizontalSplitPanel.Impl"/>
<when-property-is name="user.agent" value="safari"/>
</replace-with>
-
+
<replace-with class="com.google.gwt.user.client.ui.VerticalSplitPanel.Impl">
<when-type-is class="com.google.gwt.user.client.ui.VerticalSplitPanel.Impl"/>
</replace-with>
- <replace-with class="com.google.gwt.user.client.ui.VerticalSplitPanel.ImplIE6">
+ <replace-with class="com.google.gwt.user.client.ui.VerticalSplitPanel.ImplIE8">
<when-type-is class="com.google.gwt.user.client.ui.VerticalSplitPanel.Impl"/>
- <any>
- <when-property-is name="user.agent" value="ie6"/>
- <when-property-is name="user.agent" value="ie8"/>
- </any>
+ <when-property-is name="user.agent" value="ie8"/>
</replace-with>
</module>
diff --git a/user/src/com/google/gwt/user/TextBox.gwt.xml b/user/src/com/google/gwt/user/TextBox.gwt.xml
index 1bb1976..7fcbc29 100644
--- a/user/src/com/google/gwt/user/TextBox.gwt.xml
+++ b/user/src/com/google/gwt/user/TextBox.gwt.xml
@@ -26,11 +26,8 @@
</replace-with>
<!-- IE has a completely different TextBox implementation -->
- <replace-with class="com.google.gwt.user.client.ui.impl.TextBoxImplIE6">
+ <replace-with class="com.google.gwt.user.client.ui.impl.TextBoxImplIE8">
<when-type-is class="com.google.gwt.user.client.ui.impl.TextBoxImpl"/>
- <any>
- <when-property-is name="user.agent" value="ie6"/>
- <when-property-is name="user.agent" value="ie8"/>
- </any>
+ <when-property-is name="user.agent" value="ie8"/>
</replace-with>
</module>
diff --git a/user/src/com/google/gwt/user/Tree.gwt.xml b/user/src/com/google/gwt/user/Tree.gwt.xml
index 23d863f..856b2bc 100644
--- a/user/src/com/google/gwt/user/Tree.gwt.xml
+++ b/user/src/com/google/gwt/user/Tree.gwt.xml
@@ -18,10 +18,9 @@
<inherits name="com.google.gwt.user.UserAgent"/>
<!-- IE-specific implementation -->
- <replace-with class="com.google.gwt.user.client.ui.TreeItem.TreeItemImplIE6">
+ <replace-with class="com.google.gwt.user.client.ui.TreeItem.TreeItemImplIE8ToIE10">
<when-type-is class="com.google.gwt.user.client.ui.TreeItem.TreeItemImpl"/>
<any>
- <when-property-is name="user.agent" value="ie6"/>
<when-property-is name="user.agent" value="ie8"/>
<when-property-is name="user.agent" value="ie9"/>
<when-property-is name="user.agent" value="ie10"/>
diff --git a/user/src/com/google/gwt/user/Window.gwt.xml b/user/src/com/google/gwt/user/Window.gwt.xml
index b08ed21..b79cd1c 100644
--- a/user/src/com/google/gwt/user/Window.gwt.xml
+++ b/user/src/com/google/gwt/user/Window.gwt.xml
@@ -27,7 +27,6 @@
<replace-with class="com.google.gwt.user.client.impl.WindowImplIE">
<when-type-is class="com.google.gwt.user.client.impl.WindowImpl"/>
<any>
- <when-property-is name="user.agent" value="ie6"/>
<when-property-is name="user.agent" value="ie8"/>
<when-property-is name="user.agent" value="ie9"/>
<when-property-is name="user.agent" value="ie10"/>
diff --git a/user/src/com/google/gwt/user/cellview/CellView.gwt.xml b/user/src/com/google/gwt/user/cellview/CellView.gwt.xml
index f2210af..272f555 100644
--- a/user/src/com/google/gwt/user/cellview/CellView.gwt.xml
+++ b/user/src/com/google/gwt/user/cellview/CellView.gwt.xml
@@ -34,7 +34,6 @@
<replace-with class="com.google.gwt.user.cellview.client.CellBasedWidgetImplTrident">
<when-type-is class="com.google.gwt.user.cellview.client.CellBasedWidgetImpl"/>
<any>
- <when-property-is name="user.agent" value="ie6"/>
<when-property-is name="user.agent" value="ie8"/>
</any>
</replace-with>
@@ -61,7 +60,6 @@
<replace-with class="com.google.gwt.user.cellview.client.AbstractCellTable.ImplTrident">
<when-type-is class="com.google.gwt.user.cellview.client.AbstractCellTable.Impl"/>
<any>
- <when-property-is name="user.agent" value="ie6"/>
<when-property-is name="user.agent" value="ie8"/>
<when-property-is name="user.agent" value="ie9"/>
<when-property-is name="user.agent" value="ie10"/>
diff --git a/user/src/com/google/gwt/user/client/impl/DOMImplIE6.java b/user/src/com/google/gwt/user/client/impl/DOMImplIE6.java
deleted file mode 100644
index d71460d..0000000
--- a/user/src/com/google/gwt/user/client/impl/DOMImplIE6.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.gwt.user.client.impl;
-
-/**
- * Internet Explorer 6 implementation of
- * {@link com.google.gwt.user.client.impl.DOMImpl}.
- */
-class DOMImplIE6 extends DOMImplTrident {
-}
diff --git a/user/src/com/google/gwt/user/client/ui/HorizontalSplitPanel.java b/user/src/com/google/gwt/user/client/ui/HorizontalSplitPanel.java
index 675e71e..fbe6167 100644
--- a/user/src/com/google/gwt/user/client/ui/HorizontalSplitPanel.java
+++ b/user/src/com/google/gwt/user/client/ui/HorizontalSplitPanel.java
@@ -185,11 +185,11 @@
}
/**
- * The IE6 implementation for horizontal split panels.
+ * The IE8 implementation for horizontal split panels.
*/
@SuppressWarnings("unused")
- // will be used by IE6 permutation
- private static class ImplIE6 extends Impl {
+ // will be used by IE8 permutation
+ private static class ImplIE8 extends Impl {
private boolean isResizeInProgress = false;
@@ -324,7 +324,7 @@
private native void addResizeListener(Element container) /*-{
var self = this;
container.onresize = $entry(function() {
- self.@com.google.gwt.user.client.ui.HorizontalSplitPanel$ImplIE6::onResize()();
+ self.@com.google.gwt.user.client.ui.HorizontalSplitPanel$ImplIE8::onResize()();
});
}-*/;
diff --git a/user/src/com/google/gwt/user/client/ui/PopupPanel.java b/user/src/com/google/gwt/user/client/ui/PopupPanel.java
index c1dbd82..04614e7 100644
--- a/user/src/com/google/gwt/user/client/ui/PopupPanel.java
+++ b/user/src/com/google/gwt/user/client/ui/PopupPanel.java
@@ -219,7 +219,6 @@
}
impl.setClip(curPanel.getElement(), getRectString(0, 0, 0, 0));
RootPanel.get().add(curPanel);
- impl.onShow(curPanel.getElement());
// Wait for the popup panel and iframe to be attached before running
// the animation. We use a Timer instead of a DeferredCommand so we
@@ -247,7 +246,6 @@
if (!isUnloading) {
RootPanel.get().remove(curPanel);
}
- impl.onHide(curPanel.getElement());
}
impl.setClip(curPanel.getElement(), "rect(auto, auto, auto, auto)");
curPanel.getElement().getStyle().setProperty("overflow", "visible");
@@ -313,7 +311,6 @@
if (showing) {
if (curPanel.isGlassEnabled) {
Document.get().getBody().appendChild(curPanel.glass);
- impl.onShow(curPanel.glass);
resizeRegistration = Window.addResizeHandler(curPanel.glassResizer);
curPanel.glassResizer.onResize(null);
@@ -322,7 +319,6 @@
}
} else if (glassShowing) {
Document.get().getBody().removeChild(curPanel.glass);
- impl.onHide(curPanel.glass);
resizeRegistration.removeHandler();
resizeRegistration = null;
@@ -342,12 +338,10 @@
curPanel.setPopupPosition(curPanel.leftPosition, curPanel.topPosition);
}
RootPanel.get().add(curPanel);
- impl.onShow(curPanel.getElement());
} else {
if (!isUnloading) {
RootPanel.get().remove(curPanel);
}
- impl.onHide(curPanel.getElement());
}
curPanel.getElement().getStyle().setProperty("overflow", "visible");
}
@@ -959,9 +953,7 @@
// If the PopupImpl creates an iframe shim, it's also necessary to hide it
// as well.
- impl.setVisible(getElement(), visible);
if (glass != null) {
- impl.setVisible(glass, visible);
glass.getStyle().setProperty("visibility", visible ? "visible" : "hidden");
}
}
diff --git a/user/src/com/google/gwt/user/client/ui/ResizeLayoutPanel.java b/user/src/com/google/gwt/user/client/ui/ResizeLayoutPanel.java
index 2ee5e82..b7cf36b 100644
--- a/user/src/com/google/gwt/user/client/ui/ResizeLayoutPanel.java
+++ b/user/src/com/google/gwt/user/client/ui/ResizeLayoutPanel.java
@@ -306,28 +306,6 @@
}-*/;
}
- /**
- * Implementation of resize event used by IE6.
- */
- static class ImplIE6 extends ImplTrident {
- @Override
- public void onAttach() {
- super.onAttach();
-
- /*
- * IE6 doesn't render this panel unless you kick it after its been
- * attached.
- */
- Scheduler.get().scheduleDeferred(new ScheduledCommand() {
- public void execute() {
- if (isAttached) {
- parent.getStyle().setProperty("zoom", "1");
- }
- }
- });
- }
- }
-
private final Impl impl = GWT.create(Impl.class);
private Layer layer;
private final Layout layout;
diff --git a/user/src/com/google/gwt/user/client/ui/TreeItem.java b/user/src/com/google/gwt/user/client/ui/TreeItem.java
index 6822463..b54027e 100644
--- a/user/src/com/google/gwt/user/client/ui/TreeItem.java
+++ b/user/src/com/google/gwt/user/client/ui/TreeItem.java
@@ -112,7 +112,7 @@
/**
* IE specific implementation class for {@link TreeItem}.
*/
- public static class TreeItemImplIE6 extends TreeItemImpl {
+ public static class TreeItemImplIE8ToIE10 extends TreeItemImpl {
@Override
void convertToFullNode(TreeItem item) {
super.convertToFullNode(item);
diff --git a/user/src/com/google/gwt/user/client/ui/VerticalSplitPanel.java b/user/src/com/google/gwt/user/client/ui/VerticalSplitPanel.java
index 6816be1..2d0189f 100644
--- a/user/src/com/google/gwt/user/client/ui/VerticalSplitPanel.java
+++ b/user/src/com/google/gwt/user/client/ui/VerticalSplitPanel.java
@@ -153,11 +153,11 @@
}
/**
- * Provides an implementation for IE6/7 that relies on 100% length in CSS.
+ * Provides an implementation for IE8 that relies on 100% length in CSS.
*/
@SuppressWarnings("unused")
- // will be used by IE6 permutation
- private static class ImplIE6 extends Impl {
+ // will be used by IE8 permutation
+ private static class ImplIE8 extends Impl {
private static void expandToFitParentHorizontally(Element elem) {
addAbsolutePositoning(elem);
@@ -258,7 +258,7 @@
private native void addResizeListener(Element container) /*-{
var self = this;
container.onresize = $entry(function() {
- self.@com.google.gwt.user.client.ui.VerticalSplitPanel$ImplIE6::onResize()();
+ self.@com.google.gwt.user.client.ui.VerticalSplitPanel$ImplIE8::onResize()();
});
}-*/;
diff --git a/user/src/com/google/gwt/user/client/ui/impl/FormPanelImplIE6.java b/user/src/com/google/gwt/user/client/ui/impl/FormPanelImplIE8.java
similarity index 93%
rename from user/src/com/google/gwt/user/client/ui/impl/FormPanelImplIE6.java
rename to user/src/com/google/gwt/user/client/ui/impl/FormPanelImplIE8.java
index 09397db..2752a91 100644
--- a/user/src/com/google/gwt/user/client/ui/impl/FormPanelImplIE6.java
+++ b/user/src/com/google/gwt/user/client/ui/impl/FormPanelImplIE8.java
@@ -18,9 +18,9 @@
import com.google.gwt.dom.client.Element;
/**
- * IE6 implementation of {@link com.google.gwt.user.client.ui.impl.FormPanelImpl}.
+ * IE8 implementation of {@link com.google.gwt.user.client.ui.impl.FormPanelImpl}.
*/
-public class FormPanelImplIE6 extends FormPanelImpl {
+public class FormPanelImplIE8 extends FormPanelImpl {
@Override
public native void hookEvents(Element iframe, Element form, FormPanelImplHost listener) /*-{
diff --git a/user/src/com/google/gwt/user/client/ui/impl/PopupImpl.java b/user/src/com/google/gwt/user/client/ui/impl/PopupImpl.java
index 1bbeaa9..0fd51ee 100644
--- a/user/src/com/google/gwt/user/client/ui/impl/PopupImpl.java
+++ b/user/src/com/google/gwt/user/client/ui/impl/PopupImpl.java
@@ -37,28 +37,9 @@
/**
* @param popup the popup
- */
- public void onHide(Element popup) {
- }
-
- /**
- * @param popup the popup
- */
- public void onShow(Element popup) {
- }
-
- /**
- * @param popup the popup
* @param rect the clip rect
*/
public void setClip(Element popup, String rect) {
popup.getStyle().setProperty("clip", rect);
}
-
- /**
- * @param popup the popup
- * @param visible true if visible
- */
- public void setVisible(Element popup, boolean visible) {
- }
}
diff --git a/user/src/com/google/gwt/user/client/ui/impl/PopupImplIE6.java b/user/src/com/google/gwt/user/client/ui/impl/PopupImplIE6.java
deleted file mode 100644
index c84cb9c..0000000
--- a/user/src/com/google/gwt/user/client/ui/impl/PopupImplIE6.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.google.gwt.user.client.ui.impl;
-
-import com.google.gwt.dom.client.Element;
-
-/**
- * Internet Explorer 6 implementation of
- * {@link com.google.gwt.user.client.ui.impl.PopupImpl}.
- */
-public class PopupImplIE6 extends PopupImpl {
-
- @Override
- public native void onHide(Element popup) /*-{
- // It is at least rarely possible to get an onHide() without a matching
- // onShow(), usually because of timing issues created by animations. So
- // we're careful not to assume the existence of '__frame' here.
- var frame = popup.__frame;
- if (frame) {
- frame.parentElement.removeChild(frame);
- frame.__popup = null;
- popup.__frame = null;
- popup.onresize = null;
- popup.onmove = null;
- }
- }-*/;
-
- @Override
- public native void onShow(Element popup) /*-{
- // TODO: make this more Java and less JSNI?
- var frame = $doc.createElement('iframe');
-
- // Setting a src prevents mixed-content warnings.
- // http://weblogs.asp.net/bleroy/archive/2005/08/09/how-to-put-a-div-over-a-select-in-ie.aspx
- frame.src = "javascript:''";
-
- frame.scrolling = 'no';
- frame.frameBorder = 0;
-
- popup.__frame = frame;
- frame.__popup = popup;
-
- // Make the frame shadow the popup
- var style = frame.style;
- style.position = 'absolute';
-
- // Don't get in the way of transparency effects
- style.filter = 'alpha(opacity=0)';
-
- // Visibility of frame should match visiblity of popup element.
- style.visibility = popup.currentStyle.visibility;
-
- // Issue 2443: remove styles that affect the size of the iframe
- style.border = 0;
- style.padding = 0;
- style.margin = 0;
-
- // takes effect immediately
- style.left = popup.offsetLeft;
- style.top = popup.offsetTop;
- style.width = popup.offsetWidth;
- style.height = popup.offsetHeight;
- style.zIndex = popup.currentStyle.zIndex;
-
- // updates position and dimensions as popup is moved & resized
- popup.onmove = function() {
- frame.style.left = popup.offsetLeft;
- frame.style.top = popup.offsetTop;
- };
- popup.onresize = function() {
- frame.style.width = popup.offsetWidth;
- frame.style.height = popup.offsetHeight;
- };
- style.setExpression('zIndex', 'this.__popup.currentStyle.zIndex');
- popup.parentElement.insertBefore(frame, popup);
- }-*/;
-
- @Override
- public native void setVisible(Element popup, boolean visible) /*-{
- if (popup.__frame) {
- popup.__frame.style.visibility = visible ? 'visible' : 'hidden';
- }
- }-*/;
-}
diff --git a/user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplIE6.java b/user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplIE8toIE10.java
similarity index 97%
rename from user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplIE6.java
rename to user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplIE8toIE10.java
index faa9e10..c8afa83 100644
--- a/user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplIE6.java
+++ b/user/src/com/google/gwt/user/client/ui/impl/RichTextAreaImplIE8toIE10.java
@@ -21,7 +21,7 @@
/**
* IE6-specific implementation of rich-text editing.
*/
-public class RichTextAreaImplIE6 extends RichTextAreaImplStandard {
+public class RichTextAreaImplIE8toIE10 extends RichTextAreaImplStandard {
/**
* Helper method to allow {@link #insertHTML(String)} code to invoke
@@ -78,7 +78,7 @@
if (tr == null) {
return;
}
- if (!@com.google.gwt.user.client.ui.impl.RichTextAreaImplIE6::isOrHasChild(*)(doc.body, tr.parentElement())) {
+ if (!@com.google.gwt.user.client.ui.impl.RichTextAreaImplIE8toIE10::isOrHasChild(*)(doc.body, tr.parentElement())) {
return;
}
tr.pasteHTML(html);
diff --git a/user/src/com/google/gwt/user/client/ui/impl/TextBoxImplIE6.java b/user/src/com/google/gwt/user/client/ui/impl/TextBoxImplIE8.java
similarity index 97%
rename from user/src/com/google/gwt/user/client/ui/impl/TextBoxImplIE6.java
rename to user/src/com/google/gwt/user/client/ui/impl/TextBoxImplIE8.java
index dfd558d..ea0f644 100644
--- a/user/src/com/google/gwt/user/client/ui/impl/TextBoxImplIE6.java
+++ b/user/src/com/google/gwt/user/client/ui/impl/TextBoxImplIE8.java
@@ -18,10 +18,10 @@
import com.google.gwt.dom.client.Element;
/**
- * IE6-specific implementation of
+ * IE8-specific implementation of
* {@link com.google.gwt.user.client.ui.impl.TextBoxImpl}.
*/
-public class TextBoxImplIE6 extends TextBoxImpl {
+public class TextBoxImplIE8 extends TextBoxImpl {
@Override
public native int getCursorPos(Element elem) /*-{
diff --git a/user/src/com/google/gwt/xml/XML.gwt.xml b/user/src/com/google/gwt/xml/XML.gwt.xml
index 3f4e68e..04c71b4 100644
--- a/user/src/com/google/gwt/xml/XML.gwt.xml
+++ b/user/src/com/google/gwt/xml/XML.gwt.xml
@@ -27,7 +27,6 @@
<replace-with class="com.google.gwt.xml.client.impl.XMLParserImplIE6">
<when-type-is class="com.google.gwt.xml.client.impl.XMLParserImpl"/>
<any>
- <when-property-is name="user.agent" value="ie6"/>
<when-property-is name="user.agent" value="ie8"/>
<when-property-is name="user.agent" value="ie9"/>
</any>
