diff options
| author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-07-01 13:32:29 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-07-01 13:33:21 +0300 |
| commit | b159b8bfe615b7fb273d652b9c9bbc9f04901873 (patch) | |
| tree | d8c3b9b7ac5e31ac46d68895985014e443ba7572 /shared | |
| parent | cad8f2bf2c02fbe2a6f406d51103909d78033c9d (diff) | |
| parent | 264e617c58d537d12a03b5f3fb73f5129fcadc09 (diff) | |
| download | vaadin-framework-b159b8bfe615b7fb273d652b9c9bbc9f04901873.tar.gz vaadin-framework-b159b8bfe615b7fb273d652b9c9bbc9f04901873.zip | |
Merge remote-tracking branch 'origin/master' into grid
Conflicts:
WebContent/release-notes.html
Change-Id: I515edf75b3ba2eb0bf94fa0d747cadbce2c79a21
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/ivy.xml | 4 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/ApplicationConstants.java | 4 | ||||
| -rw-r--r-- | shared/src/com/vaadin/shared/ui/ui/UIState.java | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/shared/ivy.xml b/shared/ivy.xml index 3dfe1a51c2..2dac7adbc2 100644 --- a/shared/ivy.xml +++ b/shared/ivy.xml @@ -27,8 +27,8 @@ conf="build,ide,test->default" /> <dependency org="com.vaadin.external.google" name="guava" rev="16.0.1.vaadin1" conf="build,ide,test->default" /> - <dependency org="com.vaadin.external.google" name="android-json" - rev="0.0.20131108.vaadin1" conf="build,ide,test->default" /> + <dependency org="com.vaadin.external.json" name="json" + rev="0.0.20080701" conf="build,ide,test->default" /> <dependency org="junit" name="junit" rev="4.11" conf="test,ide -> default" /> diff --git a/shared/src/com/vaadin/shared/ApplicationConstants.java b/shared/src/com/vaadin/shared/ApplicationConstants.java index 9f723763f8..da4ac7450d 100644 --- a/shared/src/com/vaadin/shared/ApplicationConstants.java +++ b/shared/src/com/vaadin/shared/ApplicationConstants.java @@ -111,7 +111,9 @@ public class ApplicationConstants implements Serializable { public static final String CSRF_TOKEN = "csrfToken"; /** - * The name of the parameter used to transmit the sync id + * The name of the parameter used to transmit the sync id. The value can be + * set to -1 e.g. when testing with pre-recorded requests to make the + * framework ignore the sync id. * * @see com.vaadin.ui.ConnectorTracker#getCurrentSyncId() * @since 7.2 diff --git a/shared/src/com/vaadin/shared/ui/ui/UIState.java b/shared/src/com/vaadin/shared/ui/ui/UIState.java index 3c3785b7d5..abdc105ba7 100644 --- a/shared/src/com/vaadin/shared/ui/ui/UIState.java +++ b/shared/src/com/vaadin/shared/ui/ui/UIState.java @@ -62,6 +62,7 @@ public class UIState extends TabIndexState { * Configuration for the push channel */ public PushConfigurationState pushConfiguration = new PushConfigurationState(); + public String theme; { primaryStyleName = "v-ui"; // Default is 1 for legacy reasons @@ -95,7 +96,7 @@ public class UIState extends TabIndexState { NotificationRole role) { this.prefix = prefix; this.postfix = postfix; - this.notificationRole = role; + notificationRole = role; } } |