You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2006/09/21 01:27:13 UTC
svn commit: r448402 - in
/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html:
HtmlRendererUtils.java util/JavascriptUtils.java
Author: mmarinschek
Date: Wed Sep 20 16:27:13 2006
New Revision: 448402
URL: http://svn.apache.org/viewvc?view=rev&rev=448402
Log:
fix for : [MYFACES-1413] JS error in function oamSubmitForm(...). Thanks to Pavel Stetsuk for fixing the nightly edge for us.
Modified:
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?view=diff&rev=448402&r1=448401&r2=448402
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Wed Sep 20 16:27:13 2006
@@ -1110,7 +1110,7 @@
if(formName == null)
{
return "'" +CLEAR_HIDDEN_FIELD_FN_NAME
- + "_'+formName.replace('"+NamingContainer.SEPARATOR_CHAR+"','_')";
+ + "_'+formName.replace(/-/g, '\\$"+NamingContainer.SEPARATOR_CHAR+"').replace(/"+NamingContainer.SEPARATOR_CHAR+"/g,'_')";
}
else
{
Modified: myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java?view=diff&rev=448402&r1=448401&r2=448402
==============================================================================
--- myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java (original)
+++ myfaces/shared/trunk/core/src/main/java/org/apache/myfaces/shared/renderkit/html/util/JavascriptUtils.java Wed Sep 20 16:27:13 2006
@@ -118,7 +118,7 @@
*/
public static String getValidJavascriptNameAsInRI(String origIdentifier)
{
- return origIdentifier.replaceAll("-", "$_");
+ return origIdentifier.replaceAll("-", "\\$_");
}
public static String getValidJavascriptName(String s, boolean checkForReservedWord)