You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by ta...@apache.org on 2014/04/13 02:36:43 UTC
git commit: DELTASPIKE-567 Consistent post/get parameter naming
Repository: deltaspike
Updated Branches:
refs/heads/master b05724e9a -> 7f1b744c7
DELTASPIKE-567 Consistent post/get parameter naming
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/7f1b744c
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/7f1b744c
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/7f1b744c
Branch: refs/heads/master
Commit: 7f1b744c7b4ebbcc66fa299bb3755df2bb4fc510
Parents: b05724e
Author: tandraschko <ta...@apache.org>
Authored: Sun Apr 13 02:35:19 2014 +0200
Committer: tommy <to...@tommy-notebook>
Committed: Sun Apr 13 02:36:07 2014 +0200
----------------------------------------------------------------------
.../jsf/impl/scope/window/DefaultClientWindow.java | 4 ++--
.../resources/META-INF/resources/deltaspike/windowhandler.js | 8 ++++----
.../jsf/impl/src/main/resources/static/windowhandler.html | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7f1b744c/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/scope/window/DefaultClientWindow.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/scope/window/DefaultClientWindow.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/scope/window/DefaultClientWindow.java
index 531a2dc..ff1c67a 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/scope/window/DefaultClientWindow.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/scope/window/DefaultClientWindow.java
@@ -61,7 +61,7 @@ public class DefaultClientWindow implements ClientWindow
/**
* The parameter for the windowId for POST requests
*/
- public static final String DELTASPIKE_WINDOW_ID_POST_PARAM = "dsPostWindowId";
+ public static final String DELTASPIKE_WINDOW_ID_POST_PARAM = "dspwid";
public static final String JSF_WINDOW_ID_POST_PARAM = "javax.faces.ClientWindow";
/**
@@ -73,7 +73,7 @@ public class DefaultClientWindow implements ClientWindow
ClientWindow.class.getName() + ".ClientWindowRenderModeEnablement";
private static final String WINDOW_ID_COOKIE_PREFIX = "dsWindowId-";
- private static final String DELTASPIKE_REQUEST_TOKEN = "dsRid";
+ private static final String DELTASPIKE_REQUEST_TOKEN = "dsrid";
private static final String UNINITIALIZED_WINDOW_ID_VALUE = "uninitializedWindowId";
private static final String WINDOW_ID_REPLACE_PATTERN = "$$windowIdValue$$";
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7f1b744c/deltaspike/modules/jsf/impl/src/main/resources/META-INF/resources/deltaspike/windowhandler.js
----------------------------------------------------------------------
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 2d7e4d9..1db8673 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
@@ -100,10 +100,10 @@ function applyWindowId() {
var forms = document.getElementsByTagName("form");
for (var i = 0; i < forms.length; i++) {
var form = forms[i];
- var windowIdHolder = form.elements["dsPostWindowId"];
+ var windowIdHolder = form.elements["dspwid"];
if (!windowIdHolder) {
windowIdHolder = document.createElement("INPUT");
- windowIdHolder.name = "dsPostWindowId";
+ windowIdHolder.name = "dspwid";
windowIdHolder.type = "hidden";
form.appendChild(windowIdHolder);
}
@@ -171,7 +171,7 @@ function assertWindowId() {
}
function eraseRequestCookie() {
- var requestToken = getUrlParameter('dsRid'); // random request param
+ var requestToken = getUrlParameter('dsrid'); // random request param
if (requestToken) {
var cookieName = 'dsWindowId-' + requestToken;
var date = new Date();
@@ -198,7 +198,7 @@ window.onload = function(evt) {
try {
(oldWindowOnLoad)? oldWindowOnLoad(evt): null;
} finally {
- eraseRequestCookie(); // manually erase the old dsRid cookie because Firefox doesn't do it properly
+ eraseRequestCookie(); // manually erase the old dsrid cookie because Firefox doesn't do it properly
assertWindowId();
applyWindowId();
jsf.ajax.addOnEvent(jsfAjaxHandler);
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/7f1b744c/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 e49b01a..24b863a 100644
--- a/deltaspike/modules/jsf/impl/src/main/resources/static/windowhandler.html
+++ b/deltaspike/modules/jsf/impl/src/main/resources/static/windowhandler.html
@@ -161,7 +161,7 @@ window.onload = function() {
var expires = "; expires="+expdt.toGMTString();
var requestToken = Math.floor(Math.random()*999);
- var newUrl = setUrlParam(window.location.href, "dsRid", requestToken);
+ var newUrl = setUrlParam(window.location.href, "dsrid", requestToken);
// we still add hte windowId page param to support lazy windowId dropping for some clients
newUrl = setUrlParam(newUrl, "dswid", urlId);