diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-11-29 14:47:42 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-11-29 14:47:42 +0200 |
| commit | ddc6070445611cdf4f62003f8eb47e01baabbcd1 (patch) | |
| tree | cd1a5bfb288336e3b0c050f8509f7d246ba67616 /src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml | |
| parent | be546bddfe0765b4d40f4bdeb8eb5e9c1be5bdcf (diff) | |
| parent | bc93f0e2418a2f67db12212c8f13c00c4aef00a1 (diff) | |
| download | vaadin-framework-ddc6070445611cdf4f62003f8eb47e01baabbcd1.tar.gz vaadin-framework-ddc6070445611cdf4f62003f8eb47e01baabbcd1.zip | |
Merge remote branch 'origin/master' into windowing
Conflicts:
src/com/vaadin/ui/AbstractField.java
tests/testbench/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.java
Diffstat (limited to 'src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml index 9cf2a828db..f2fc764e28 100644 --- a/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml +++ b/src/com/vaadin/terminal/gwt/DefaultWidgetSet.gwt.xml @@ -18,12 +18,6 @@ <when-type-is class="com.google.gwt.core.client.impl.SchedulerImpl" /> </replace-with> - <!-- Use our own history impl for IE7 to workaround #2931. --> - <replace-with class="com.vaadin.terminal.gwt.client.HistoryImplIEVaadin"> - <when-type-is class="com.google.gwt.user.client.impl.HistoryImpl" /> - <when-property-is name="user.agent" value="ie6" /> - </replace-with> - <generate-with class="com.vaadin.terminal.gwt.widgetsetutils.EagerWidgetMapGenerator"> <when-type-is class="com.vaadin.terminal.gwt.client.WidgetMap" /> @@ -57,7 +51,6 @@ <when-type-is class="com.vaadin.terminal.gwt.client.ui.VDragAndDropWrapper" /> <any> - <when-property-is name="user.agent" value="ie6" /> <when-property-is name="user.agent" value="ie8" /> </any> </replace-with> |