Repository: deltaspike Updated Branches: refs/heads/master 0cfa2517e -> e9213ad21
DELTASPIKE-1074 Severe problem in setUrlParam() Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/e9213ad2 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/e9213ad2 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/e9213ad2 Branch: refs/heads/master Commit: e9213ad212a39c70cfd969ea00ad1a2d5209c544 Parents: 0cfa251 Author: tandraschko <[email protected]> Authored: Wed Feb 17 16:17:02 2016 +0100 Committer: tandraschko <[email protected]> Committed: Wed Feb 17 16:17:02 2016 +0100 ---------------------------------------------------------------------- .../resources/deltaspike/windowhandler.js | 25 +++++++++++--------- 1 file changed, 14 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/e9213ad2/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 fabb36f..287fd57 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 @@ -393,7 +393,7 @@ window.dswh = window.dswh || { setUrlParam : function(uri, parameterName, parameterValue) { var a = document.createElement('a'); - a.href = uri.replace('?&', '?').replace('&&', '&'); + a.href = uri; // set empty string as value if not defined or empty if (!parameterValue || parameterValue.replace(/^\s+|\s+$/g, '').length === 0) { @@ -422,15 +422,18 @@ window.dswh = window.dswh || { for (var i = 0; i < oldParameters.length; i++) { var oldParameterPair = oldParameters[i]; - var oldParameterName = oldParameterPair.split('=')[0]; - var oldParameterValue = oldParameterPair.split('=')[1]; - - // don't add empty parameters again - if (oldParameterValue && oldParameterValue.replace(/^\s+|\s+$/g, '').length > 0) { - if (oldParameterName === parameterName) { - newParameters.push(oldParameterName + "=" + encodeURIComponent(parameterValue)); - } else { - newParameters.push(oldParameterName + "=" + oldParameterValue); + + if (oldParameterPair.length > 0) { + var oldParameterName = oldParameterPair.split('=')[0]; + var oldParameterValue = oldParameterPair.split('=')[1]; + + // don't add empty parameters again + if (oldParameterValue && oldParameterValue.replace(/^\s+|\s+$/g, '').length > 0) { + if (oldParameterName === parameterName) { + newParameters.push(oldParameterName + "=" + encodeURIComponent(parameterValue)); + } else { + newParameters.push(oldParameterName + "=" + oldParameterValue); + } } } } @@ -466,7 +469,7 @@ window.dswh = window.dswh || { }, generateRequestToken : function() { - return Math.floor(Math.random() * 999); + return "" + Math.floor(Math.random() * 999); }, storeCookie : function(name, value, seconds) {
