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-1113 WindowIdHtmlRenderer should skip DELEGATED
Date Sat, 16 Apr 2016 09:18:33 GMT
Repository: deltaspike
Updated Branches:
  refs/heads/master 6950f2542 -> 2018d4ed4


DELTASPIKE-1113 WindowIdHtmlRenderer should skip DELEGATED

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

Branch: refs/heads/master
Commit: 2018d4ed490881a11d60a854dd5a168c46248f2c
Parents: 6950f25
Author: Thomas Andraschko <tandraschko@apache.org>
Authored: Sat Apr 16 11:18:24 2016 +0200
Committer: Thomas Andraschko <tandraschko@apache.org>
Committed: Sat Apr 16 11:18:24 2016 +0200

----------------------------------------------------------------------
 .../jsf/impl/component/window/WindowIdHtmlRenderer.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2018d4ed/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
index 63d5984..b703639 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/component/window/WindowIdHtmlRenderer.java
@@ -59,19 +59,21 @@ public class WindowIdHtmlRenderer extends Renderer
 
         lazyInit();
 
-        String windowId = clientWindow.getWindowId(context);
         ClientWindowConfig.ClientWindowRenderMode clientWindowRenderMode =
                 clientWindowConfig.getClientWindowRenderMode(context);
 
+        // see DELTASPIKE-1113
         boolean delegatedWindowMode =
             ClientWindowConfig.ClientWindowRenderMode.DELEGATED.equals(clientWindowRenderMode);
-
-        // don't cut the windowId generated from JSF
-        if (!delegatedWindowMode)
+        if (delegatedWindowMode)
         {
-            windowId = secureWindowId(windowId);
+            return;
         }
 
+        String windowId = clientWindow.getWindowId(context);
+        // just to get sure if a user provides a own client window
+        windowId = secureWindowId(windowId);
+
         ResponseWriter writer = context.getResponseWriter();
         writer.write("<script type=\"text/javascript\">");
         writer.write("(function(){");


Mime
View raw message