You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2014/09/01 22:35:39 UTC
svn commit: r1621879 - in
/myfaces/core/branches/2.1.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html:
HtmlJavaScriptUtils.java HtmlRendererUtils.java
Author: lu4242
Date: Mon Sep 1 20:35:38 2014
New Revision: 1621879
URL: http://svn.apache.org/r1621879
Log:
MYFACES-3919 javax.faces.SEPARATOR_CHAR Applied Incorrectly to commandLink Hidden Field (Thanks to Bill Lucy for provide this patch)
Modified:
myfaces/core/branches/2.1.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java
myfaces/core/branches/2.1.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
Modified: myfaces/core/branches/2.1.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java?rev=1621879&r1=1621878&r2=1621879&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java (original)
+++ myfaces/core/branches/2.1.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlJavaScriptUtils.java Mon Sep 1 20:35:38 2014
@@ -156,9 +156,9 @@ public final class HtmlJavaScriptUtils
private static void prepareScript(FacesContext facesContext,
ScriptContext context, boolean autoScroll)
{
-
- final char separatorChar = UINamingContainer
- .getSeparatorChar(facesContext);
+ // MYFACES-3919 remember idcl separator char is special and always should be ':',
+ // because it should be hardcoded into the js file.
+ final char idclSeparatorChar = ':';
context.prettyLine();
//render a function to create a hidden input, if it doesn't exist
@@ -302,7 +302,7 @@ public final class HtmlJavaScriptUtils
context.prettyLine();
context.append(SET_HIDDEN_INPUT_FN_NAME);
- context.append("(formName,formName +'" + separatorChar + "'+'"
+ context.append("(formName,formName +'" + idclSeparatorChar + "'+'"
+ HtmlRendererUtils.HIDDEN_COMMANDLINK_FIELD_NAME
+ "',linkId);");
@@ -355,7 +355,7 @@ public final class HtmlJavaScriptUtils
context.prettyLine();
context.append(CLEAR_HIDDEN_INPUT_FN_NAME);
- context.append("(formName,formName +'" + separatorChar + "'+'"
+ context.append("(formName,formName +'" + idclSeparatorChar + "'+'"
+ HtmlRendererUtils.HIDDEN_COMMANDLINK_FIELD_NAME
+ "',linkId);");
Modified: myfaces/core/branches/2.1.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?rev=1621879&r1=1621878&r2=1621879&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/core/branches/2.1.x/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Mon Sep 1 20:35:38 2014
@@ -1581,8 +1581,8 @@ public final class HtmlRendererUtils
{
return HIDDEN_COMMANDLINK_FIELD_NAME_TRINIDAD;
}
- return formInfo.getFormName() + UINamingContainer.getSeparatorChar(FacesContext
- .getCurrentInstance()) + HIDDEN_COMMANDLINK_FIELD_NAME;
+ return formInfo.getFormName() + ':'
+ + HIDDEN_COMMANDLINK_FIELD_NAME;
}
public static String getHiddenCommandLinkFieldName(
@@ -1592,7 +1592,7 @@ public final class HtmlRendererUtils
{
return HIDDEN_COMMANDLINK_FIELD_NAME_TRINIDAD;
}
- return formInfo.getFormName() + UINamingContainer.getSeparatorChar(facesContext)
+ return formInfo.getFormName() + ':'
+ HIDDEN_COMMANDLINK_FIELD_NAME;
}
@@ -1626,7 +1626,7 @@ public final class HtmlRendererUtils
public static String getHiddenCommandLinkFieldNameMyfacesOld(
FormInfo formInfo)
{
- return formInfo.getFormName() + UINamingContainer.getSeparatorChar(FacesContext.getCurrentInstance())
+ return formInfo.getFormName() + ':'
+ HIDDEN_COMMANDLINK_FIELD_NAME_MYFACES_OLD;
}