diff options
| author | Tatu Lund <tatu@vaadin.com> | 2021-09-28 11:01:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-28 11:01:01 +0300 |
| commit | 6cb484d3574c7e7c683b32792105382a7bd2acf4 (patch) | |
| tree | 7521b324a58faa4d83bfdfe8e83a05fda2178e65 | |
| parent | 0f7e06233849aa0abb042d3778ccc110e5f240b6 (diff) | |
| download | vaadin-framework-6cb484d3574c7e7c683b32792105382a7bd2acf4.tar.gz vaadin-framework-6cb484d3574c7e7c683b32792105382a7bd2acf4.zip | |
Add MPR UI id request parameter (#12414)
* Add MPR UI id request parameter
* Update test
* Update test
3 files changed, 10 insertions, 0 deletions
diff --git a/server/src/main/resources/VAADIN/vaadinBootstrap.js b/server/src/main/resources/VAADIN/vaadinBootstrap.js index 9fce53509a..e03bb31e10 100644 --- a/server/src/main/resources/VAADIN/vaadinBootstrap.js +++ b/server/src/main/resources/VAADIN/vaadinBootstrap.js @@ -354,6 +354,12 @@ params += '&v-wn=' + encodeURIComponent(window.name); } + // This parameter is used in multiplatform-runtime as a key for + // storing the MPR UI content in the session + if (window.mprUiId) { + params += '&v-mui=' + encodeURIComponent(window.mprUiId); + } + // Detect touch device support var supportsTouch = false; try { diff --git a/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitBrowserDetails.java b/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitBrowserDetails.java index 130d432940..957f99b038 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitBrowserDetails.java +++ b/uitest/src/main/java/com/vaadin/tests/components/ui/UIInitBrowserDetails.java @@ -37,6 +37,7 @@ public class UIInitBrowserDetails extends AbstractTestUI { addDetail("dst saving", "v-dstd", wb.getDSTSavings()); addDetail("dst in effect", "v-dston", wb.isDSTInEffect()); addDetail("current date", "v-curdate", wb.getCurrentDate()); + addDetail("mpr ui id", "v-mui", ""); } private void addDetail(String name, String param, Object value) { diff --git a/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java b/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java index 641ac6d82a..303c338eb1 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java @@ -21,6 +21,9 @@ public class UIInitBrowserDetailsTest extends MultiBrowserTest { compareRequestAndBrowserValue("v-sw", "screen width", "-1"); /* screen height */ compareRequestAndBrowserValue("v-sh", "screen height", "-1"); + /* mpr ui id */ + compareRequestAndBrowserValue("v-mui", "mpr ui id", + "any-non-empty-value"); /* timezone offset */ assertTextNotNull("timezone offset"); /* raw timezone offset */ |