Skip to content

fix: Add MPR UI id request parameter #12412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 28, 2021
Merged

fix: Add MPR UI id request parameter #12412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d206bdb
fix: Add MPR UI id request parameter
mshabarov Sep 24, 2021
eb8ca92
test: Remove redundant non-empty param test
mshabarov Sep 26, 2021
60b6b0e
test: Remove leftovers
mshabarov Sep 26, 2021
7975f97
fix: Init window.mprUiId earlier than window.vaadin
mshabarov Sep 27, 2021
1108d59
Add missing '='
mshabarov Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions server/src/main/resources/VAADIN/vaadinBootstrap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,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 {
Expand Down
1 change: 1 addition & 0 deletions uitest/src/main/java/com/vaadin/tests/components/ui/UIInitBrowserDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ protected void setup(VaadinRequest request) {
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) {
Expand Down
5 changes: 4 additions & 1 deletion uitest/src/test/java/com/vaadin/tests/components/ui/UIInitBrowserDetailsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
public class UIInitBrowserDetailsTest extends MultiBrowserTest {

@Test
public void testBrowserDetails() throws Exception {
public void testBrowserDetails() {
openTestURL();
/* location */
compareRequestAndBrowserValue("v-loc", "location", "null");
Expand All @@ -23,6 +23,9 @@ public void testBrowserDetails() throws Exception {
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 */
Expand Down