deltaspike-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tandrasc...@apache.org
Subject deltaspike git commit: DELTASPIKE-1148 Reduce redirects in CLIENTWINDOW mode when opening a link in a new tab
Date Thu, 19 May 2016 21:36:15 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master f21e0266d -> 531f0450d


DELTASPIKE-1148 Reduce redirects in CLIENTWINDOW mode when opening a link in a new tab

Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/531f0450
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/531f0450
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/531f0450

Branch: refs/heads/master
Commit: 531f0450defa2e1abbcf1d9db33eb8e403ce2ab6
Parents: f21e026
Author: Thomas Andraschko <tandraschko@apache.org>
Authored: Thu May 19 23:36:07 2016 +0200
Committer: Thomas Andraschko <tandraschko@apache.org>
Committed: Thu May 19 23:36:07 2016 +0200

----------------------------------------------------------------------
 .../jsf/impl/src/main/resources/static/windowhandler.html   | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/531f0450/deltaspike/modules/jsf/impl/src/main/resources/static/windowhandler.html
----------------------------------------------------------------------
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 60bea75..806c7dc 100644
--- a/deltaspike/modules/jsf/impl/src/main/resources/static/windowhandler.html
+++ b/deltaspike/modules/jsf/impl/src/main/resources/static/windowhandler.html
@@ -124,12 +124,10 @@
                 loadCss(true);
 
                 var windowId = dswh.utils.getWindowIdFromWindowName();
-                var urlWindowId = windowId;
 
                 function requestNewWindowId() {
-                    window.name = '';
-                    windowId = 'automatedEntryPoint';
-                    urlWindowId = null;
+                    windowId = dswh.utils.generateNewWindowId();
+                    dswh.utils.setWindowIdAsWindowName(windowId);
                 }
 
                 dswh.utils.log('------- DeltaSpike windowhandler.html -------');
@@ -169,7 +167,6 @@
 
                         dswh.utils.setWindowIdAsWindowName(newWindowId); // set the window.name
with our windowId
                         windowId = newWindowId;
-                        urlWindowId = newWindowId;
                     }
                 }
 
@@ -178,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", urlWindowId);
+                redirectUrl = dswh.utils.setUrlParam(redirectUrl, "dswid", windowId);
 
                 dswh.utils.storeCookie('dsrwid-' + requestToken, windowId, 3);
 


Mime
View raw message