summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2013-02-20 15:24:18 +0200
committerVaadin Code Review <review@vaadin.com>2013-02-21 07:58:52 +0000
commit07754fdb1a4b30df5bc4ebda067cf32aadaaeb2f (patch)
tree0397602ce7464050e0cc7bf18133ad66d778690e
parent253686349291d7d808bc9c47bc7dbd604ddc4ff1 (diff)
downloadvaadin-framework-07754fdb1a4b30df5bc4ebda067cf32aadaaeb2f.tar.gz
vaadin-framework-07754fdb1a4b30df5bc4ebda067cf32aadaaeb2f.zip
Don't update primary stylename if it's already up to date (#11088)
Change-Id: I059d7ec83f8c4ae43d2ab6e2c80177675c6881d0
-rw-r--r--client/src/com/vaadin/client/ui/AbstractComponentConnector.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/AbstractComponentConnector.java b/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
index 51051644c0..694db6f02c 100644
--- a/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
+++ b/client/src/com/vaadin/client/ui/AbstractComponentConnector.java
@@ -284,7 +284,8 @@ public abstract class AbstractComponentConnector extends AbstractConnector
AbstractComponentState state = getState();
String primaryStyleName = getWidget().getStylePrimaryName();
- if (state.primaryStyleName != null) {
+ if (state.primaryStyleName != null
+ && !state.primaryStyleName.equals(primaryStyleName)) {
/*
* We overwrite the widgets primary stylename if state defines a
* primary stylename.