This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/deltaspike.git
The following commit(s) were added to refs/heads/master by this push:
new 39b8c68fb DELTASPIKE-1464
39b8c68fb is described below
commit 39b8c68fb4b9f817ce34490f56f6374b55319172
Author: Thomas Andraschko <[email protected]>
AuthorDate: Fri Mar 31 10:18:30 2023 +0200
DELTASPIKE-1464
---
.../META-INF/resources/deltaspike/windowhandler.js | 26 +++++++++++-----------
.../src/main/resources/static/windowhandler.html | 2 +-
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/deltaspike/modules/jsf/impl/src/main/resources/META-INF/resources/deltaspike/windowhandler.js
b/deltaspike/modules/jsf/impl/src/main/resources/META-INF/resources/deltaspike/windowhandler.js
index 46ed9e9fe..010b805b2 100644
---
a/deltaspike/modules/jsf/impl/src/main/resources/META-INF/resources/deltaspike/windowhandler.js
+++
b/deltaspike/modules/jsf/impl/src/main/resources/META-INF/resources/deltaspike/windowhandler.js
@@ -329,10 +329,10 @@ window.dswh = window.dswh || {
},
assertWindowId : function() {
- var dswid = dswh.utils.getUrlParameter(window.location.href,
'dswid');
+ var jfwid = dswh.utils.getUrlParameter(window.location.href,
'jfwid');
dswh.utils.log('--- #assertWindowId');
- dswh.utils.log('dswid: ' + dswid);
+ dswh.utils.log('jfwid: ' + jfwid);
// window name is defined -> existing tab
if (dswh.utils.isWindowNameDefined()) {
@@ -346,10 +346,10 @@ window.dswh = window.dswh || {
if (windowId === dswh.TEMP_WINDOW_NAME) {
// enabled initial redirect
// -> use the new windowId from the url
- if (dswid) {
+ if (jfwid) {
dswh.utils.log('assign window name from
request parameter');
- dswh.utils.setWindowIdAsWindowName(dswid);
+ dswh.utils.setWindowIdAsWindowName(jfwid);
}
// disabled initial redirect
// -> use the new windowId from the rendered
config as no url param is available
@@ -367,10 +367,10 @@ window.dswh = window.dswh || {
}
// window name doesn't match requested windowId
// -> redirect to the same view with current windowId
from the window name
- else if (windowId !== dswid) {
+ else if (windowId !== jfwid) {
dswh.utils.log('reload url with window name');
- window.location =
dswh.utils.setUrlParam(window.location.href, 'dswid', windowId);
+ window.location =
dswh.utils.setUrlParam(window.location.href, 'jfwid', windowId);
}
}
else {
@@ -382,10 +382,10 @@ window.dswh = window.dswh || {
// window name is undefined -> "open in new tab/window" was
used
else {
// url param available?
- if (dswid) {
+ if (jfwid) {
// initial redirect
// -> the windowId is valid - we don't need to a
second request
- if (dswh.cfg.initialRedirectWindowId && dswid ===
dswh.cfg.initialRedirectWindowId) {
+ if (dswh.cfg.initialRedirectWindowId && jfwid ===
dswh.cfg.initialRedirectWindowId) {
dswh.utils.log('assign window name from
initialRedirectWindowId');
dswh.utils.setWindowIdAsWindowName(dswh.cfg.initialRedirectWindowId);
@@ -411,9 +411,9 @@ window.dswh = window.dswh || {
cleanupCookies : function() {
dswh.utils.log('--- #cleanupCookies');
- var dswid = dswh.utils.getUrlParameter(window.location.href,
'dswid');
- if (dswid) {
- dswh.utils.expireCookie('dsrwid-' + dswid);
+ var jfwid = dswh.utils.getUrlParameter(window.location.href,
'jfwid');
+ if (jfwid) {
+ dswh.utils.expireCookie('dsrwid-' + jfwid);
}
}
}
@@ -460,8 +460,8 @@ window.dswh = window.dswh || {
// set temp window name to remember the current state
dswh.utils.setWindowIdAsWindowName(dswh.TEMP_WINDOW_NAME);
- // we remove the dswid if available and redirect to the same url
again to create a new windowId
- window.location = dswh.utils.setUrlParam(window.location.href,
'dswid', null);
+ // we remove the jfwid if available and redirect to the same url
again to create a new windowId
+ window.location = dswh.utils.setUrlParam(window.location.href,
'jfwid', null);
// set temp window name to remember the current state (again -
sometimes required for IE!?)
dswh.utils.setWindowIdAsWindowName(dswh.TEMP_WINDOW_NAME);
diff --git
a/deltaspike/modules/jsf/impl/src/main/resources/static/windowhandler.html
b/deltaspike/modules/jsf/impl/src/main/resources/static/windowhandler.html
index 6cc68ac9f..2e5b59993 100644
--- a/deltaspike/modules/jsf/impl/src/main/resources/static/windowhandler.html
+++ b/deltaspike/modules/jsf/impl/src/main/resources/static/windowhandler.html
@@ -175,7 +175,7 @@
var redirectUrl = '$$requestUrl$$';
redirectUrl = dswh.utils.setUrlParam(redirectUrl, "dsrid",
requestToken);
// we still add the windowId page param to support lazy
windowId dropping for some clients
- redirectUrl = dswh.utils.setUrlParam(redirectUrl, "dswid",
windowId);
+ redirectUrl = dswh.utils.setUrlParam(redirectUrl, "jfwid",
windowId);
dswh.utils.storeCookie('dsrwid-' + requestToken, windowId, 3);
