You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2006/10/12 00:24:53 UTC

svn commit: r463085 [1/2] - in /incubator/adffaces/trunk/trinidad: trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ trinidad-impl/src...

Author: awiner
Date: Wed Oct 11 17:24:51 2006
New Revision: 463085

URL: http://svn.apache.org/viewvc?view=rev&rev=463085
Log:
Write Faces-major renderer for reset button.  Sadly, the golden files were always bogus (they were testing commandButton, not resetButton!), so all-new golden files too.

Added:
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ResetButtonRenderer.java
Modified:
    incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ResetButton.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLookAndFeel.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLookAndFeel.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopUtils.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimal-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalIE-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalIERtl-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalInacc-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalPPC-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalSaf-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalScrRdr-golden.xml
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/testScripts/resetButton.xml

Modified: incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ResetButton.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ResetButton.xml?view=diff&rev=463085&r1=463084&r2=463085
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ResetButton.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-build/src/main/resources/META-INF/maven-faces-plugin/renderers/trinidad/ResetButton.xml Wed Oct 11 17:24:51 2006
@@ -21,7 +21,7 @@
     <renderer>
       <component-family>org.apache.myfaces.trinidad.ResetButton</component-family>
       <renderer-type>org.apache.myfaces.trinidad.ResetButton</renderer-type>
-      <renderer-class>org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase</renderer-class>
+      <renderer-class>org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.ResetButtonRenderer</renderer-class>
       <renderer-extension>
         <mfp:component-type>org.apache.myfaces.trinidad.CoreResetButton</mfp:component-type>
       </renderer-extension>

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java?view=diff&rev=463085&r1=463084&r2=463085
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandButtonRenderer.java Wed Oct 11 17:24:51 2006
@@ -70,7 +70,7 @@
     ResponseWriter rw = context.getResponseWriter();
     rw.startElement(element, component);
     renderId(context, component);
-    rw.writeAttribute("type", useButtonTag ? "button" : "submit", null);
+    rw.writeAttribute("type", useButtonTag ? getButtonType() : getInputType(), null);
     if (getDisabled(bean))
     {
       rw.writeAttribute("disabled", Boolean.TRUE, "disabled");
@@ -115,6 +115,15 @@
     rw.endElement(element);
   }
 
+  protected String getButtonType()
+  {
+    return "button";
+  }
+
+  protected String getInputType()
+  {
+    return "submit";
+  }
     
   protected boolean useButtonTags(RenderingContext arc)
   {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java?view=diff&rev=463085&r1=463084&r2=463085
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/CommandLinkRenderer.java Wed Oct 11 17:24:51 2006
@@ -152,10 +152,18 @@
     return true;
   }
 
+  /**
+   * Returns the component's onclick
+   */
+  final protected String getComponentOnclick(FacesBean bean)
+  {
+    return super.getOnclick(bean);
+  }
+
   @Override
   protected String getOnclick(FacesBean bean)
   {
-    String onclick = super.getOnclick(bean);
+    String onclick = getComponentOnclick(bean);
     RenderingContext arc = RenderingContext.getCurrentInstance();
     String id = arc.getCurrentClientId();
     boolean immediate = getImmediate(bean);

Added: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ResetButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ResetButtonRenderer.java?view=auto&rev=463085
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ResetButtonRenderer.java (added)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ResetButtonRenderer.java Wed Oct 11 17:24:51 2006
@@ -0,0 +1,79 @@
+/*
+ * Copyright  2005,2006 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
+
+import java.io.IOException;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+
+import org.apache.myfaces.trinidad.bean.FacesBean;
+import org.apache.myfaces.trinidad.bean.PropertyKey;
+import org.apache.myfaces.trinidad.component.core.input.CoreResetButton;
+import org.apache.myfaces.trinidad.context.RenderingContext;
+
+public class ResetButtonRenderer extends CommandButtonRenderer
+{
+  public ResetButtonRenderer()
+  {
+    super(CoreResetButton.TYPE);
+  }
+
+  protected String getButtonType()
+  {
+    return "reset";
+  }
+
+  protected String getInputType()
+  {
+    return "reset";
+  }
+
+  @Override
+  protected String getOnclick(FacesBean bean)
+  {
+    String onclick = getComponentOnclick(bean);
+
+    RenderingContext arc = RenderingContext.getCurrentInstance();
+    if (arc.getFormData() != null)
+    {
+      String formName = arc.getFormData().getName();
+      if (formName != null)
+      {
+        onclick = XhtmlUtils.getChainedJS(onclick,
+                                          "resetForm('" + formName +
+                                             "');return false;",
+                                          true);
+      }
+    }
+    
+    return onclick;
+  }
+
+  protected String getDefaultStyleClass(FacesBean bean)
+  {
+    return SkinSelectors.AF_RESET_BUTTON_STYLE_CLASS;
+  }
+
+  protected boolean getPartialSubmit(FacesBean bean)
+  {
+    return false;
+  }
+}

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java?view=diff&rev=463085&r1=463084&r2=463085
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SkinSelectors.java Wed Oct 11 17:24:51 2006
@@ -329,6 +329,16 @@
 
    //                                                                         //
    //                                                                         //
+   // ============================ tr:resetButton ========================= //
+   //                                                                         //
+   //                                                                         //
+
+   // ============================ Style classes ============================ //
+  public static final String AF_RESET_BUTTON_STYLE_CLASS =
+    "af|resetButton";
+
+   //                                                                         //
+   //                                                                         //
    // ============================ tr:inputColor ============================ //
    //                                                                         //
    //                                                                         //

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java?view=diff&rev=463085&r1=463084&r2=463085
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/UIConstants.java Wed Oct 11 17:24:51 2006
@@ -448,7 +448,6 @@
   public static final String PROCESS_STEPS_NAME = "processSteps";
   public static final String PRODUCT_BRANDING_NAME = "productBranding";
   public static final String RAW_TEXT_NAME = "rawText";
-  public static final String RESET_BUTTON_NAME = "resetButton";
   public static final String ROW_LAYOUT_NAME = "rowLayout";
   public static final String SCRIPT_NAME = "script";
   public static final String SELECT_OPTION_NAME = "selectOption";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLookAndFeel.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLookAndFeel.java?view=diff&rev=463085&r1=463084&r2=463085
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLookAndFeel.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLookAndFeel.java Wed Oct 11 17:24:51 2006
@@ -93,7 +93,6 @@
     PAGE_LAYOUT_NAME,
     PROCESS_CHOICE_BAR_NAME,
     PROCESS_TRAIN_NAME,
-    RESET_BUTTON_NAME,
     SEPARATOR_NAME,
     SHOW_ITEM_NAME,
     SHOW_ONE_TAB_NAME,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLookAndFeel.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLookAndFeel.java?view=diff&rev=463085&r1=463084&r2=463085
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLookAndFeel.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLookAndFeel.java Wed Oct 11 17:24:51 2006
@@ -111,7 +111,6 @@
     PAGE_NAME,
     PAGE_MENU_BUTTONS_NAME,
     PAGE_NAVIGATION_PATH_NAME,
-    RESET_BUTTON_NAME,
     ROW_LAYOUT_NAME,
     SCRIPT_NAME,
     SELECT_OPTION_NAME,

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopUtils.java?view=diff&rev=463085&r1=463084&r2=463085
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SimpleDesktopUtils.java Wed Oct 11 17:24:51 2006
@@ -98,7 +98,6 @@
     _registerRenderer(laf, UIConstants.SIDE_BAR_NAME);
     _registerRenderer(laf, UIConstants.TAB_BAR_NAME);
     _registerRenderer(laf, UIConstants.BUTTON_NAME);
-    _registerRenderer(laf, UIConstants.RESET_BUTTON_NAME);
     _registerRenderer(laf, UIConstants.SUBMIT_BUTTON_NAME);
 
   }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss?view=diff&rev=463085&r1=463084&r2=463085
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/resources/META-INF/adf/styles/base-desktop.xss Wed Oct 11 17:24:51 2006
@@ -2291,7 +2291,13 @@
   </style>
 
   <style selector="af|goButton">
-    <includeStyle name="AFDefaultFont"/>
+    <!-- make commandButton primary -->
+    <includeStyle selector="af|commandButton"/>
+  </style>
+
+  <style selector="af|resetButton">
+    <!-- make commandButton primary -->
+    <includeStyle selector="af|commandButton"/>
   </style>
 
   <style selector="af|column::cell-text">

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimal-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimal-golden.xml?view=diff&rev=463085&r1=463084&r2=463085
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimal-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimal-golden.xml Wed Oct 11 17:24:51 2006
@@ -1,8 +1,8 @@
 <results>
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -11,9 +11,9 @@
 <!--AttributeTest[onclick,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="return _chain('test-onclick','submitForm(\'formId\',1,{source:\'mainId\'});return false;',this,event,true)"
-           type="button"
+           class="af_resetButton"
+           onclick="return _chain('test-onclick','resetForm(\'formId\');return false;',this,event,true)"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -22,10 +22,10 @@
 <!--AttributeTest[ondblclick,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            ondblclick="test-ondblclick"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -34,10 +34,10 @@
 <!--AttributeTest[onkeydown,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeydown="test-onkeydown"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -46,10 +46,10 @@
 <!--AttributeTest[onkeypress,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeypress="test-onkeypress"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -58,10 +58,10 @@
 <!--AttributeTest[onkeyup,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeyup="test-onkeyup"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -70,10 +70,10 @@
 <!--AttributeTest[onmousedown,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmousedown="test-onmousedown"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -82,10 +82,10 @@
 <!--AttributeTest[onmousemove,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmousemove="test-onmousemove"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -94,10 +94,10 @@
 <!--AttributeTest[onmouseout,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseout="test-onmouseout"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -106,10 +106,10 @@
 <!--AttributeTest[onmouseover,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseover="test-onmouseover"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -118,10 +118,10 @@
 <!--AttributeTest[onmouseup,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseup="test-onmouseup"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -131,9 +131,9 @@
 
       <button
            accesskey="u"
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -147,9 +147,9 @@
 <!--AttributeTest[id,myid]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'myid'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:myid"
            name="uri-attr:myid"
           >
@@ -158,10 +158,10 @@
 <!--AttributeTest[inlineStyle,background-color:red]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            style="background-color:red"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -170,10 +170,10 @@
 <!--AttributeTest[shortDesc,my button]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            title="my button"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -182,20 +182,9 @@
 <!--AttributeTest[styleClass,mystyle]-->
 
       <button
-           class="mystyle af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[textAndAccessKey,&B]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="mystyle af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -204,9 +193,9 @@
 <!--AttributeTest[disabled,false]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -215,57 +204,9 @@
 <!--AttributeTest[disabled,true]-->
 
       <button
-           class="af_commandButton p_AFDisabled"
+           class="af_resetButton p_AFDisabled"
            disabled="disabled"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[immediate,false]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[immediate,true]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',0,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[partialSubmit,false]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[partialSubmit,true]-->
-
-      <script
-          >
-        var _pprUpdateMode=false;function _adfspu(f,v,e,s,o){_pprUpdateMode=true;if(!o)o=new Object();o.event=(e)?e:'update';if(s)o.source=s;_submitPartialChange(f,v,o);}
-      </script>
-      <button
-           class="af_commandButton"
-           onclick="_adfspu('formId',1,0,'mainId');return false;"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalIE-golden.xml?view=diff&rev=463085&r1=463084&r2=463085
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalIE-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalIE-golden.xml Wed Oct 11 17:24:51 2006
@@ -1,8 +1,8 @@
 <results>
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -11,9 +11,9 @@
 <!--AttributeTest[onclick,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="return _chain('test-onclick','submitForm(\'formId\',1,{source:\'mainId\'});return false;',this,event,true)"
-           type="button"
+           class="af_resetButton"
+           onclick="return _chain('test-onclick','resetForm(\'formId\');return false;',this,event,true)"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -22,10 +22,10 @@
 <!--AttributeTest[ondblclick,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            ondblclick="test-ondblclick"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -34,10 +34,10 @@
 <!--AttributeTest[onkeydown,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeydown="test-onkeydown"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -46,10 +46,10 @@
 <!--AttributeTest[onkeypress,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeypress="test-onkeypress"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -58,10 +58,10 @@
 <!--AttributeTest[onkeyup,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeyup="test-onkeyup"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -70,10 +70,10 @@
 <!--AttributeTest[onmousedown,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmousedown="test-onmousedown"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -82,10 +82,10 @@
 <!--AttributeTest[onmousemove,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmousemove="test-onmousemove"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -94,10 +94,10 @@
 <!--AttributeTest[onmouseout,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseout="test-onmouseout"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -106,10 +106,10 @@
 <!--AttributeTest[onmouseover,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseover="test-onmouseover"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -118,10 +118,10 @@
 <!--AttributeTest[onmouseup,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseup="test-onmouseup"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -131,9 +131,9 @@
 
       <button
            accesskey="u"
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -147,9 +147,9 @@
 <!--AttributeTest[id,myid]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'myid'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:myid"
            name="uri-attr:myid"
           >
@@ -158,10 +158,10 @@
 <!--AttributeTest[inlineStyle,background-color:red]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            style="background-color:red"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -170,10 +170,10 @@
 <!--AttributeTest[shortDesc,my button]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            title="my button"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -182,20 +182,9 @@
 <!--AttributeTest[styleClass,mystyle]-->
 
       <button
-           class="mystyle af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[textAndAccessKey,&B]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="mystyle af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -204,9 +193,9 @@
 <!--AttributeTest[disabled,false]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -215,57 +204,9 @@
 <!--AttributeTest[disabled,true]-->
 
       <button
-           class="af_commandButton p_AFDisabled"
+           class="af_resetButton p_AFDisabled"
            disabled="disabled"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[immediate,false]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[immediate,true]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',0,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[partialSubmit,false]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[partialSubmit,true]-->
-
-      <script
-          >
-        var _pprUpdateMode=false;function _adfspu(f,v,e,s,o){_pprUpdateMode=true;if(!o)o=new Object();o.event=(e)?e:'update';if(s)o.source=s;_submitPartialChange(f,v,o);}
-      </script>
-      <button
-           class="af_commandButton"
-           onclick="_adfspu('formId',1,0,'mainId');return false;"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalIERtl-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalIERtl-golden.xml?view=diff&rev=463085&r1=463084&r2=463085
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalIERtl-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalIERtl-golden.xml Wed Oct 11 17:24:51 2006
@@ -1,8 +1,8 @@
 <results>
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -11,9 +11,9 @@
 <!--AttributeTest[onclick,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="return _chain('test-onclick','submitForm(\'formId\',1,{source:\'mainId\'});return false;',this,event,true)"
-           type="button"
+           class="af_resetButton"
+           onclick="return _chain('test-onclick','resetForm(\'formId\');return false;',this,event,true)"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -22,10 +22,10 @@
 <!--AttributeTest[ondblclick,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            ondblclick="test-ondblclick"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -34,10 +34,10 @@
 <!--AttributeTest[onkeydown,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeydown="test-onkeydown"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -46,10 +46,10 @@
 <!--AttributeTest[onkeypress,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeypress="test-onkeypress"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -58,10 +58,10 @@
 <!--AttributeTest[onkeyup,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeyup="test-onkeyup"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -70,10 +70,10 @@
 <!--AttributeTest[onmousedown,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmousedown="test-onmousedown"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -82,10 +82,10 @@
 <!--AttributeTest[onmousemove,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmousemove="test-onmousemove"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -94,10 +94,10 @@
 <!--AttributeTest[onmouseout,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseout="test-onmouseout"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -106,10 +106,10 @@
 <!--AttributeTest[onmouseover,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseover="test-onmouseover"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -118,10 +118,10 @@
 <!--AttributeTest[onmouseup,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseup="test-onmouseup"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -131,9 +131,9 @@
 
       <button
            accesskey="u"
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -147,9 +147,9 @@
 <!--AttributeTest[id,myid]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'myid'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:myid"
            name="uri-attr:myid"
           >
@@ -158,10 +158,10 @@
 <!--AttributeTest[inlineStyle,background-color:red]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            style="background-color:red"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -170,10 +170,10 @@
 <!--AttributeTest[shortDesc,my button]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            title="my button"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -182,20 +182,9 @@
 <!--AttributeTest[styleClass,mystyle]-->
 
       <button
-           class="mystyle af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[textAndAccessKey,&B]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="mystyle af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -204,9 +193,9 @@
 <!--AttributeTest[disabled,false]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -215,57 +204,9 @@
 <!--AttributeTest[disabled,true]-->
 
       <button
-           class="af_commandButton p_AFDisabled"
+           class="af_resetButton p_AFDisabled"
            disabled="disabled"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[immediate,false]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[immediate,true]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',0,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[partialSubmit,false]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[partialSubmit,true]-->
-
-      <script
-          >
-        var _pprUpdateMode=false;function _adfspu(f,v,e,s,o){_pprUpdateMode=true;if(!o)o=new Object();o.event=(e)?e:'update';if(s)o.source=s;_submitPartialChange(f,v,o);}
-      </script>
-      <button
-           class="af_commandButton"
-           onclick="_adfspu('formId',1,0,'mainId');return false;"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalInacc-golden.xml?view=diff&rev=463085&r1=463084&r2=463085
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalInacc-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalInacc-golden.xml Wed Oct 11 17:24:51 2006
@@ -1,8 +1,8 @@
 <results>
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -11,9 +11,9 @@
 <!--AttributeTest[onclick,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="return _chain('test-onclick','submitForm(\'formId\',1,{source:\'mainId\'});return false;',this,event,true)"
-           type="button"
+           class="af_resetButton"
+           onclick="return _chain('test-onclick','resetForm(\'formId\');return false;',this,event,true)"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -22,10 +22,10 @@
 <!--AttributeTest[ondblclick,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            ondblclick="test-ondblclick"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -34,10 +34,10 @@
 <!--AttributeTest[onkeydown,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeydown="test-onkeydown"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -46,10 +46,10 @@
 <!--AttributeTest[onkeypress,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeypress="test-onkeypress"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -58,10 +58,10 @@
 <!--AttributeTest[onkeyup,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeyup="test-onkeyup"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -70,10 +70,10 @@
 <!--AttributeTest[onmousedown,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmousedown="test-onmousedown"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -82,10 +82,10 @@
 <!--AttributeTest[onmousemove,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmousemove="test-onmousemove"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -94,10 +94,10 @@
 <!--AttributeTest[onmouseout,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseout="test-onmouseout"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -106,10 +106,10 @@
 <!--AttributeTest[onmouseover,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseover="test-onmouseover"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -118,10 +118,10 @@
 <!--AttributeTest[onmouseup,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseup="test-onmouseup"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -131,9 +131,9 @@
 
       <button
            accesskey="u"
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -147,9 +147,9 @@
 <!--AttributeTest[id,myid]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'myid'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:myid"
            name="uri-attr:myid"
           >
@@ -158,10 +158,10 @@
 <!--AttributeTest[inlineStyle,background-color:red]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            style="background-color:red"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -170,10 +170,10 @@
 <!--AttributeTest[shortDesc,my button]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            title="my button"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -182,20 +182,9 @@
 <!--AttributeTest[styleClass,mystyle]-->
 
       <button
-           class="mystyle af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[textAndAccessKey,&B]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="mystyle af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -204,9 +193,9 @@
 <!--AttributeTest[disabled,false]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -215,57 +204,9 @@
 <!--AttributeTest[disabled,true]-->
 
       <button
-           class="af_commandButton p_AFDisabled"
+           class="af_resetButton p_AFDisabled"
            disabled="disabled"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[immediate,false]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[immediate,true]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',0,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[partialSubmit,false]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[partialSubmit,true]-->
-
-      <script
-          >
-        var _pprUpdateMode=false;function _adfspu(f,v,e,s,o){_pprUpdateMode=true;if(!o)o=new Object();o.event=(e)?e:'update';if(s)o.source=s;_submitPartialChange(f,v,o);}
-      </script>
-      <button
-           class="af_commandButton"
-           onclick="_adfspu('formId',1,0,'mainId');return false;"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalPPC-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalPPC-golden.xml?view=diff&rev=463085&r1=463084&r2=463085
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalPPC-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalPPC-golden.xml Wed Oct 11 17:24:51 2006
@@ -1,8 +1,8 @@
 <results>
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -11,9 +11,9 @@
 <!--AttributeTest[onclick,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="return _chain('test-onclick','submitForm(\'formId\',1,{source:\'mainId\'});return false;',this,event,true)"
-           type="button"
+           class="af_resetButton"
+           onclick="return _chain('test-onclick','resetForm(\'formId\');return false;',this,event,true)"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -22,10 +22,10 @@
 <!--AttributeTest[ondblclick,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            ondblclick="test-ondblclick"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -34,10 +34,10 @@
 <!--AttributeTest[onkeydown,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeydown="test-onkeydown"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -46,10 +46,10 @@
 <!--AttributeTest[onkeypress,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeypress="test-onkeypress"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -58,10 +58,10 @@
 <!--AttributeTest[onkeyup,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeyup="test-onkeyup"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -70,10 +70,10 @@
 <!--AttributeTest[onmousedown,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmousedown="test-onmousedown"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -82,10 +82,10 @@
 <!--AttributeTest[onmousemove,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmousemove="test-onmousemove"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -94,10 +94,10 @@
 <!--AttributeTest[onmouseout,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseout="test-onmouseout"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -106,10 +106,10 @@
 <!--AttributeTest[onmouseover,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseover="test-onmouseover"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -118,10 +118,10 @@
 <!--AttributeTest[onmouseup,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseup="test-onmouseup"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -130,9 +130,9 @@
 <!--AttributeTest[accessKey,u]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -141,9 +141,9 @@
 <!--AttributeTest[id,myid]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'myid'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:myid"
            name="uri-attr:myid"
           >
@@ -152,10 +152,10 @@
 <!--AttributeTest[inlineStyle,background-color:red]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            style="background-color:red"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -164,10 +164,10 @@
 <!--AttributeTest[shortDesc,my button]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            title="my button"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -176,20 +176,9 @@
 <!--AttributeTest[styleClass,mystyle]-->
 
       <button
-           class="mystyle af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[textAndAccessKey,&B]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="mystyle af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -198,9 +187,9 @@
 <!--AttributeTest[disabled,false]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -209,57 +198,9 @@
 <!--AttributeTest[disabled,true]-->
 
       <button
-           class="af_commandButton p_AFDisabled"
+           class="af_resetButton p_AFDisabled"
            disabled="disabled"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[immediate,false]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[immediate,true]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',0,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[partialSubmit,false]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[partialSubmit,true]-->
-
-      <script
-          >
-        var _pprUpdateMode=false;function _adfspu(f,v,e,s,o){_pprUpdateMode=true;if(!o)o=new Object();o.event=(e)?e:'update';if(s)o.source=s;_submitPartialChange(f,v,o);}
-      </script>
-      <button
-           class="af_commandButton"
-           onclick="_adfspu('formId',1,0,'mainId');return false;"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalSaf-golden.xml?view=diff&rev=463085&r1=463084&r2=463085
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalSaf-golden.xml (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/resetButton-minimalSaf-golden.xml Wed Oct 11 17:24:51 2006
@@ -1,8 +1,8 @@
 <results>
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -11,9 +11,9 @@
 <!--AttributeTest[onclick,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="return _chain('test-onclick','submitForm(\'formId\',1,{source:\'mainId\'});return false;',this,event,true)"
-           type="button"
+           class="af_resetButton"
+           onclick="return _chain('test-onclick','resetForm(\'formId\');return false;',this,event,true)"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -22,10 +22,10 @@
 <!--AttributeTest[ondblclick,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            ondblclick="test-ondblclick"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -34,10 +34,10 @@
 <!--AttributeTest[onkeydown,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeydown="test-onkeydown"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -46,10 +46,10 @@
 <!--AttributeTest[onkeypress,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeypress="test-onkeypress"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -58,10 +58,10 @@
 <!--AttributeTest[onkeyup,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onkeyup="test-onkeyup"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -70,10 +70,10 @@
 <!--AttributeTest[onmousedown,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmousedown="test-onmousedown"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -82,10 +82,10 @@
 <!--AttributeTest[onmousemove,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmousemove="test-onmousemove"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -94,10 +94,10 @@
 <!--AttributeTest[onmouseout,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseout="test-onmouseout"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -106,10 +106,10 @@
 <!--AttributeTest[onmouseover,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseover="test-onmouseover"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -118,10 +118,10 @@
 <!--AttributeTest[onmouseup,null]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            onmouseup="test-onmouseup"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -131,9 +131,9 @@
 
       <button
            accesskey="u"
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -147,9 +147,9 @@
 <!--AttributeTest[id,myid]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'myid'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:myid"
            name="uri-attr:myid"
           >
@@ -158,10 +158,10 @@
 <!--AttributeTest[inlineStyle,background-color:red]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            style="background-color:red"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -170,10 +170,10 @@
 <!--AttributeTest[shortDesc,my button]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
            title="my button"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -182,20 +182,9 @@
 <!--AttributeTest[styleClass,mystyle]-->
 
       <button
-           class="mystyle af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[textAndAccessKey,&B]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="mystyle af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -204,9 +193,9 @@
 <!--AttributeTest[disabled,false]-->
 
       <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
+           class="af_resetButton"
+           onclick="resetForm('formId');return false;"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >
@@ -215,57 +204,9 @@
 <!--AttributeTest[disabled,true]-->
 
       <button
-           class="af_commandButton p_AFDisabled"
+           class="af_resetButton p_AFDisabled"
            disabled="disabled"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[immediate,false]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[immediate,true]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',0,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[partialSubmit,false]-->
-
-      <button
-           class="af_commandButton"
-           onclick="submitForm('formId',1,{source:'mainId'});return false;"
-           type="button"
-           id="uri-attr:mainId"
-           name="uri-attr:mainId"
-          >
-        ButtonText
-      </button>
-<!--AttributeTest[partialSubmit,true]-->
-
-      <script
-          >
-        var _pprUpdateMode=false;function _adfspu(f,v,e,s,o){_pprUpdateMode=true;if(!o)o=new Object();o.event=(e)?e:'update';if(s)o.source=s;_submitPartialChange(f,v,o);}
-      </script>
-      <button
-           class="af_commandButton"
-           onclick="_adfspu('formId',1,0,'mainId');return false;"
-           type="button"
+           type="reset"
            id="uri-attr:mainId"
            name="uri-attr:mainId"
           >