Revision: 9377
Author: jlaba...@google.com
Date: Wed Dec 8 04:10:15 2010
Log: Cherry picking r9376 into release branch for issue #5722.
http://code.google.com/p/google-web-toolkit/source/detail?r=9377
Modified:
/releases/2.1/user/src/com/google/gwt/cell/client/IconCellDecorator.java
/releases/2.1/user/src/com/google/gwt/user/cellview/CellView.gwt.xml
/releases/2.1/user/src/com/google/gwt/user/cellview/client/CellBrowser.css
/releases/2.1/user/src/com/google/gwt/user/cellview/client/CellList.css
/releases/2.1/user/src/com/google/gwt/user/cellview/client/CellTree.css
/releases/2.1/user/src/com/google/gwt/user/cellview/client/CellTree.java
/releases/2.1/user/src/com/google/gwt/user/cellview/client/CellTreeBasic.css
/releases/2.1/user/test/com/google/gwt/cell/client/IconCellDecoratorTest.java
=======================================
---
/releases/2.1/user/src/com/google/gwt/cell/client/IconCellDecorator.java
Wed Dec 1 07:51:56 2010
+++
/releases/2.1/user/src/com/google/gwt/cell/client/IconCellDecorator.java
Wed Dec 8 04:10:15 2010
@@ -38,7 +38,7 @@
public class IconCellDecorator<C> implements Cell<C> {
interface Template extends SafeHtmlTemplates {
- @Template("<div
style=\"position:relative;padding-{0}:{1}px;\">{2}<div>{3}</div></div>")
+ @Template("<div
style=\"position:relative;padding-{0}:{1}px;zoom:1;\">{2}<div>{3}</div></div>")
SafeHtml outerDiv(String direction, int width, SafeHtml icon,
SafeHtml cellContents);
=======================================
--- /releases/2.1/user/src/com/google/gwt/user/cellview/CellView.gwt.xml
Mon Nov 15 02:27:58 2010
+++ /releases/2.1/user/src/com/google/gwt/user/cellview/CellView.gwt.xml
Wed Dec 8 04:10:15 2010
@@ -54,12 +54,4 @@
<when-property-is name="user.agent" value="ie8"/>
</any>
</replace-with>
-
- <!-- IE6-specific CellTree implementation. -->
- <replace-with
class="com.google.gwt.user.cellview.client.CellTree.ImplIE6">
- <when-type-is
class="com.google.gwt.user.cellview.client.CellTree.Impl"/>
- <any>
- <when-property-is name="user.agent" value="ie6"/>
- </any>
- </replace-with>
</module>
=======================================
---
/releases/2.1/user/src/com/google/gwt/user/cellview/client/CellBrowser.css
Wed Oct 13 10:19:59 2010
+++
/releases/2.1/user/src/com/google/gwt/user/cellview/client/CellBrowser.css
Wed Dec 8 04:10:15 2010
@@ -27,10 +27,12 @@
.cellBrowserEvenItem {
padding: 8px;
+ zoom: 1;
}
.cellBrowserOddItem {
padding: 8px;
+ zoom: 1;
}
.cellBrowserKeyboardSelectedItem {
=======================================
--- /releases/2.1/user/src/com/google/gwt/user/cellview/client/CellList.css
Wed Sep 22 12:58:01 2010
+++ /releases/2.1/user/src/com/google/gwt/user/cellview/client/CellList.css
Wed Dec 8 04:10:15 2010
@@ -19,10 +19,12 @@
.cellListEvenItem {
cursor: pointer;
+ zoom: 1;
}
.cellListOddItem {
cursor: pointer;
+ zoom: 1;
}
.cellListKeyboardSelectedItem {
=======================================
--- /releases/2.1/user/src/com/google/gwt/user/cellview/client/CellTree.css
Wed Sep 22 12:58:01 2010
+++ /releases/2.1/user/src/com/google/gwt/user/cellview/client/CellTree.css
Wed Dec 8 04:10:15 2010
@@ -27,6 +27,7 @@
padding-bottom: 4px;
cursor: hand;
cursor: pointer;
+ zoom: 1;
}
.cellTreeItemImage {
@@ -34,7 +35,7 @@
}
.cellTreeItemImageValue {
-
+ zoom: 1;
}
.cellTreeItemValue {
=======================================
---
/releases/2.1/user/src/com/google/gwt/user/cellview/client/CellTree.java
Wed Nov 24 02:08:09 2010
+++
/releases/2.1/user/src/com/google/gwt/user/cellview/client/CellTree.java
Wed Dec 8 04:10:15 2010
@@ -443,11 +443,6 @@
+ "width:{2}px;height:{3}px;\">{4}</div>")
SafeHtml imageWrapper(String classes, String direction, int width,
int height, SafeHtml image);
-
- @Template("<div class=\"{0}\" style=\"position:absolute;{1}:-{2}px;"
- + "width:{2}px;height:{3}px;\">{4}</div>")
- SafeHtml imageWrapperIE6(String classes, String direction, int width,
- int height, SafeHtml image);
}
/**
@@ -462,30 +457,6 @@
return template.imageWrapper(classes, direction, width, height,
image);
}
}
-
- /**
- * Implementation of {...@link CellTable} used by IE6.
- */
- @SuppressWarnings("unused")
- private static class ImplIE6 extends Impl {
- @Override
- public SafeHtml imageWrapper(String classes, String direction, int
width,
- int height, SafeHtml image) {
- /*
- * In IE6, left/right positions are relative to the inside of the
padding
- * instead of the outside of the padding. The bug does not happen on
IE7,
- * which maps to the IE6 user agent, so we need a runtime check for
IE6.
- */
- if (isIe6()) {
- return template.imageWrapperIE6(classes, direction, width, height,
image);
- }
- return super.imageWrapper(classes, direction, width, height, image);
- }
-
- private native boolean isIe6() /*-{
- return @com.google.gwt.dom.client.DOMImplIE6::isIE6()();
- }-*/;
- }
/**
* The default number of children to show under a tree node.
=======================================
---
/releases/2.1/user/src/com/google/gwt/user/cellview/client/CellTreeBasic.css
Wed Sep 22 12:58:01 2010
+++
/releases/2.1/user/src/com/google/gwt/user/cellview/client/CellTreeBasic.css
Wed Dec 8 04:10:15 2010
@@ -27,6 +27,7 @@
padding-bottom: 4px;
cursor: hand;
cursor: pointer;
+ zoom: 1;
}
.cellTreeItemImage {
@@ -34,7 +35,7 @@
}
.cellTreeItemImageValue {
-
+ zoom: 1;
}
.cellTreeItemValue {
=======================================
---
/releases/2.1/user/test/com/google/gwt/cell/client/IconCellDecoratorTest.java
Wed Dec 1 07:51:56 2010
+++
/releases/2.1/user/test/com/google/gwt/cell/client/IconCellDecoratorTest.java
Wed Dec 8 04:10:15 2010
@@ -67,7 +67,7 @@
cell.render(context, "helloworld", sb);
// Compare the expected render string.
- String expected = "<div
style=\"position:relative;padding-left:64px;\">";
+ String expected = "<div
style=\"position:relative;padding-left:64px;zoom:1;\">";
expected += cell.getImageHtml(images.prettyPiccy(),
HasVerticalAlignment.ALIGN_MIDDLE, true).asString();
expected += "<div>helloworld</div>";
@@ -123,7 +123,7 @@
@Override
protected String getExpectedInnerHtml() {
IconCellDecorator<String> cell = createCell();
- String html = "<div style=\"position:relative;padding-left:64px;\">";
+ String html = "<div
style=\"position:relative;padding-left:64px;zoom:1;\">";
html += cell.getIconHtml("helloworld").asString();
html += "<div>helloworld</div>";
html += "</div>";
@@ -133,7 +133,7 @@
@Override
protected String getExpectedInnerHtmlNull() {
IconCellDecorator<String> cell = createCell();
- String html = "<div style=\"position:relative;padding-left:64px;\">";
+ String html = "<div
style=\"position:relative;padding-left:64px;zoom:1;\">";
html += cell.getIconHtml("helloworld").asString();
html += "<div></div>";
html += "</div>";
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
