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 2008/04/11 19:40:01 UTC

svn commit: r647237 - in /myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html: HtmlButtonRendererBase.java HtmlLinkRendererBase.java HtmlRendererUtils.java

Author: lu4242
Date: Fri Apr 11 10:39:58 2008
New Revision: 647237

URL: http://svn.apache.org/viewvc?rev=647237&view=rev
Log:
fix MYFACES-1855 hidden fields created when using h:commandLink and f:param should be created and removed using javascript

Modified:
    myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java
    myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
    myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java

Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java?rev=647237&r1=647236&r2=647237&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlButtonRendererBase.java Fri Apr 11 10:39:58 2008
@@ -217,12 +217,12 @@
 
         //The hidden field has only sense if isRenderClearJavascriptOnButton is
         //set to true. In other case, this hidden field should not be rendered.
-        if (JavascriptUtils.isRenderClearJavascriptOnButton(facesContext.getExternalContext()))
-        {
+        //if (JavascriptUtils.isRenderClearJavascriptOnButton(facesContext.getExternalContext()))
+        //{
             //add hidden field for the case there is no commandLink in the form
-            String hiddenFieldName = HtmlRendererUtils.getHiddenCommandLinkFieldName(formInfo);
-            addHiddenCommandParameter(facesContext, nestingForm, hiddenFieldName);
-        }
+            //String hiddenFieldName = HtmlRendererUtils.getHiddenCommandLinkFieldName(formInfo);
+            //addHiddenCommandParameter(facesContext, nestingForm, hiddenFieldName);
+        //}
 
         return onClick;
     }

Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java?rev=647237&r1=647236&r2=647237&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlLinkRendererBase.java Fri Apr 11 10:39:58 2008
@@ -274,10 +274,10 @@
             }
             onClick.append(");");
 
-
+            //Not necessary since we are using oamSetHiddenInput to create input hidden fields
             //render hidden field - todo: in here for backwards compatibility
-            String hiddenFieldName = HtmlRendererUtils.getHiddenCommandLinkFieldName(formInfo);
-            addHiddenCommandParameter(facesContext, nestingForm, hiddenFieldName);
+            //String hiddenFieldName = HtmlRendererUtils.getHiddenCommandLinkFieldName(formInfo);
+            //addHiddenCommandParameter(facesContext, nestingForm, hiddenFieldName);
 
         }
 
@@ -312,7 +312,8 @@
                     throw new IllegalArgumentException("Unnamed parameter value not allowed within command link.");
                 }
 
-                addHiddenCommandParameter(FacesContext.getCurrentInstance(), nestingForm, name);
+                //Not necessary, since we are using oamSetHiddenInput to create hidden fields
+                //addHiddenCommandParameter(FacesContext.getCurrentInstance(), nestingForm, name);
 
                 Object value = ((UIParameter) child).getValue();
 

Modified: myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?rev=647237&r1=647236&r2=647237&view=diff
==============================================================================
--- myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/shared/trunk_3.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Fri Apr 11 10:39:58 2008
@@ -1019,7 +1019,7 @@
 
         context.prettyLine();
 
-        //render a function to clear a hidden input, if it exists
+        //render a function to clear a hidden input, if it exists        
         context.append("function ");
         context.append(CLEAR_HIDDEN_INPUT_FN_NAME).append("(formname, name, value)");
         context.append("{");
@@ -1027,7 +1027,8 @@
         context.prettyLine();
         context.append("if(typeof form.elements[name]!='undefined')");
         context.append("{");
-        context.append("form.elements[name].value=null;");
+        //context.append("form.elements[name].value=null;");
+        context.append("form.removeChild(form.elements[name]);");
         context.append("}");
 
         context.append("}");