From 6d87a124ce5035adfc211a9c434c29453399190c Mon Sep 17 00:00:00 2001 From: John Alhroos Date: Mon, 8 Aug 2011 13:56:14 +0000 Subject: Fixes header and footer scrolling in Opera #5450 svn changeset:20175/svn branch:6.6 --- src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index a5411fa0e7..8f254da535 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -2699,7 +2699,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, } public void setHorizontalScrollPosition(int scrollLeft) { - if (BrowserInfo.get().isIE6()) { + if (BrowserInfo.get().isIE6() || BrowserInfo.get().isOpera()) { hTableWrapper.getStyle().setPosition(Position.RELATIVE); hTableWrapper.getStyle().setLeft(-scrollLeft, Unit.PX); } else { @@ -3547,7 +3547,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, * The value of the leftScroll */ public void setHorizontalScrollPosition(int scrollLeft) { - if (BrowserInfo.get().isIE6()) { + if (BrowserInfo.get().isIE6() || BrowserInfo.get().isOpera()) { hTableWrapper.getStyle().setProperty("position", "relative"); hTableWrapper.getStyle().setPropertyPx("left", -scrollLeft); } else { -- cgit v1.2.3 From 782a0d7d1c4c830f965e78777973587b6ac8fffa Mon Sep 17 00:00:00 2001 From: John Alhroos Date: Mon, 8 Aug 2011 14:04:58 +0000 Subject: Reverted [20175] since it caused captions to disappear in some tests. Need to find another way to fix it #5450 svn changeset:20176/svn branch:6.6 --- src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java index 8f254da535..a5411fa0e7 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java @@ -2699,7 +2699,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, } public void setHorizontalScrollPosition(int scrollLeft) { - if (BrowserInfo.get().isIE6() || BrowserInfo.get().isOpera()) { + if (BrowserInfo.get().isIE6()) { hTableWrapper.getStyle().setPosition(Position.RELATIVE); hTableWrapper.getStyle().setLeft(-scrollLeft, Unit.PX); } else { @@ -3547,7 +3547,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler, * The value of the leftScroll */ public void setHorizontalScrollPosition(int scrollLeft) { - if (BrowserInfo.get().isIE6() || BrowserInfo.get().isOpera()) { + if (BrowserInfo.get().isIE6()) { hTableWrapper.getStyle().setProperty("position", "relative"); hTableWrapper.getStyle().setPropertyPx("left", -scrollLeft); } else { -- cgit v1.2.3 From 1cc55d854dbe7ae7c0edc0b3584c2177363091de Mon Sep 17 00:00:00 2001 From: John Alhroos Date: Tue, 9 Aug 2011 05:35:49 +0000 Subject: Made portlet session transient #7366 svn changeset:20187/svn branch:6.6 --- src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java index fac1f17ba7..49d40cbc62 100644 --- a/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java +++ b/src/com/vaadin/terminal/gwt/server/PortletApplicationContext.java @@ -29,7 +29,7 @@ import com.vaadin.Application; public class PortletApplicationContext extends WebApplicationContext implements Serializable { - protected PortletSession portletSession; + protected transient PortletSession portletSession; protected Map> portletListeners = new HashMap>(); -- cgit v1.2.3 From 575aeb7ef3d386adcd88416acb4899f031a28a80 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Tue, 9 Aug 2011 06:37:05 +0000 Subject: Remove extra .custom from custom build version number svn changeset:20190/svn branch:6.6 --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index 3197f15c56..7883cb5112 100644 --- a/build/build.xml +++ b/build/build.xml @@ -1016,7 +1016,7 @@ - + -- cgit v1.2.3 From d6e4157a195f05aaa4f5b627c5a5b1d05c9f7899 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Tue, 9 Aug 2011 10:48:28 +0000 Subject: #7272 Firefox 5 (and 6) occasionally fail to load theme CSS svn changeset:20215/svn branch:6.6 --- src/com/vaadin/terminal/gwt/client/ApplicationConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java index 056428881f..7eb9f4d1ec 100755 --- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java +++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java @@ -568,7 +568,7 @@ public class ApplicationConnection { } int cssWaits = 0; - static final int MAX_CSS_WAITS = 20; + static final int MAX_CSS_WAITS = 100; protected void handleWhenCSSLoaded(final String jsonText, final ValueMap json) { -- cgit v1.2.3