svn commit: r670438 - in /myfaces/trinidad/trunk/trinidad-impl/src/main: java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java javascript/META-INF/adf/jsLibs/Core.js

[ma...@apache.org]

Author: matzew
Date: Sun Jun 22 20:01:35 2008
New Revision: 670438

URL: http://svn.apache.org/viewvc?rev=670438&view=rev
Log:
TRINIDAD-695 - tr:form skips c/s validation on submit by 'defaultCommand'

Modified:
    myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
    myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java?rev=670438&r1=670437&r2=670438&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/FormRenderer.java Sun Jun 22 20:01:35 2008
@@ -26,6 +26,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import javax.faces.component.ActionSource;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIForm;
 import javax.faces.context.FacesContext;
@@ -965,14 +966,21 @@
         = component.findComponent(defaultCommand);
     }
 
-    if (defaultCommandComponent != null)
+    if (defaultCommandComponent != null && (defaultCommandComponent instanceof ActionSource))
     {
       // Get the true clientId
       String defaultCommandId =
         defaultCommandComponent.getClientId(context);
+      int immediate = 1;
+
+      if(((ActionSource) defaultCommandComponent).isImmediate())
+      {
+        immediate = 0;
+      }
       submitFunc = "return _submitOnEnter"
                      + "(event,'"  + clientId
-                     + "'," + "'" + defaultCommandId + "');";
+                     + "'," + "'" + defaultCommandId
+                     + "'," + immediate +");";
     }
     else
     {

Modified: myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js?rev=670438&r1=670437&r2=670438&view=diff
==============================================================================
--- myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js (original)
+++ myfaces/trinidad/trunk/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js Sun Jun 22 20:01:35 2008
@@ -1861,9 +1861,9 @@
  * This function is called when enter key is hit on any form input element.
  * @src if non-null, the ID of the object to fire
  */
-function _submitOnEnter(e, frm,src)
+function _submitOnEnter(e, frm, src, immediate)
 {
-  if (window.event != (void 0))
+  if (window.event != null)
     e = window.event;
 
   var eventSource;
@@ -1884,13 +1884,13 @@
   {
     if (_getKC(e)==13)
     {
-      if (src != (void 0))
+      if (src != null)
       {
         var params = new Object();
         params[src] = src;
         params['source'] = src;
 
-        submitForm(frm,0,params);
+        submitForm(frm,immediate,params);
       }
 
       return false;