diff options
3 files changed, 15 insertions, 5 deletions
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss index 989e1d3f5a..fe17d90e26 100644 --- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss +++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-minimal-style.scss @@ -105,9 +105,15 @@ -moz-border-radius: 7px; } -.v-ie9 & .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-caption-close:only-child, -.v-ie9 & .#{$primaryStyleName}-tabs-minimal .v-captiontext:first-child + .#{$primaryStyleName}-caption-close { - margin-top: -14px; +.v-ie9 & .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-tabitem .#{$primaryStyleName}-caption-close { + &, &:hover, &:active { + + /* IE9 suffers from rounding subpixel values errors when measuring the tabs which makes the close button wrap. */ + margin-left: 2.5px; + + /* The close button is a pixel too high in IE9, adjust for that */ + margin-top: 1px; + } } .#{$primaryStyleName}-tabs-minimal .#{$primaryStyleName}-caption-close:hover, diff --git a/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java b/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java index f6eb893528..5749912f43 100644 --- a/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java +++ b/uitest/src/com/vaadin/tests/components/table/SetDataSourceWithPropertyIds.java @@ -4,7 +4,6 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import com.vaadin.data.Buffered.SourceException; import com.vaadin.data.util.BeanItemContainer; import com.vaadin.server.VaadinRequest; import com.vaadin.shared.ui.MarginInfo; @@ -12,6 +11,7 @@ import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.ui.Button; import com.vaadin.ui.Label; import com.vaadin.ui.Table; +import com.vaadin.ui.Table.CacheUpdateException; public class SetDataSourceWithPropertyIds extends AbstractTestUI { @@ -71,7 +71,7 @@ public class SetDataSourceWithPropertyIds extends AbstractTestUI { table.setContainerDataSource(jobContainer); table.setVisibleColumns(new String[] { "jobId" }); label.setValue("no Exception"); - } catch (SourceException e) { + } catch (CacheUpdateException e) { ArrayList<String> propertyIds = new ArrayList<String>(); propertyIds.add("jobId"); table.setContainerDataSource(jobContainer, propertyIds); diff --git a/uitest/vaadin-server.xml b/uitest/vaadin-server.xml index 3628483436..e02fab8564 100644 --- a/uitest/vaadin-server.xml +++ b/uitest/vaadin-server.xml @@ -11,6 +11,10 @@ <java classname="org.mortbay.jetty.runner.Runner" fork="yes"> <arg value="--port" /> <arg value="8888" /> + <arg value="--out" /> + <arg value="${vaadin.basedir}/result/jetty.out" /> + <arg value="--log" /> + <arg value="${vaadin.basedir}/result/jetty.log" /> <arg value="${war.file}" /> <classpath refid="classpath.jetty" /> <jvmarg value="-ea" /> |