craigmcc 01/02/23 13:13:11
Modified: src/share/org/apache/struts/action Action.java
ActionServlet.java
src/share/org/apache/struts/taglib/html Constants.java
Log:
Recognize cancelled form submits even if the Cancel "button" is an <input>
tag of type "image", so that the X and Y coordainates of the button press
are transmitted.
Revision Changes Path
1.19 +6 -5 jakarta-struts/src/share/org/apache/struts/action/Action.java
Index: Action.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/Action.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Action.java 2001/02/21 00:35:41 1.18
+++ Action.java 2001/02/23 21:13:09 1.19
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/Action.java,v 1.18
2001/02/21 00:35:41 craigmcc Exp $
- * $Revision: 1.18 $
- * $Date: 2001/02/21 00:35:41 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/Action.java,v 1.19
2001/02/23 21:13:09 craigmcc Exp $
+ * $Revision: 1.19 $
+ * $Date: 2001/02/23 21:13:09 $
*
* ====================================================================
*
@@ -106,7 +106,7 @@
* by this Action.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.18 $ $Date: 2001/02/21 00:35:41 $
+ * @version $Revision: 1.19 $ $Date: 2001/02/23 21:13:09 $
*/
public class Action {
@@ -463,7 +463,8 @@
*/
protected boolean isCancelled(HttpServletRequest request) {
- return (request.getParameter(Constants.CANCEL_PROPERTY) != null);
+ return ((request.getParameter(Constants.CANCEL_PROPERTY) != null) ||
+ (request.getParameter(Constants.CANCEL_PROPERTY_X) != null));
}
1.62 +6 -5
jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
Index: ActionServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ActionServlet.java 2001/02/23 19:57:38 1.61
+++ ActionServlet.java 2001/02/23 21:13:09 1.62
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 1.61
2001/02/23 19:57:38 craigmcc Exp $
- * $Revision: 1.61 $
- * $Date: 2001/02/23 19:57:38 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 1.62
2001/02/23 21:13:09 craigmcc Exp $
+ * $Revision: 1.62 $
+ * $Date: 2001/02/23 21:13:09 $
*
* ====================================================================
*
@@ -230,7 +230,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.61 $ $Date: 2001/02/23 19:57:38 $
+ * @version $Revision: 1.62 $ $Date: 2001/02/23 21:13:09 $
*/
public class ActionServlet
@@ -1940,7 +1940,8 @@
log(" Validating input form properties");
// Was this submit cancelled?
- if (request.getParameter(Constants.CANCEL_PROPERTY) != null) {
+ if ((request.getParameter(Constants.CANCEL_PROPERTY) != null) ||
+ (request.getParameter(Constants.CANCEL_PROPERTY_X) != null)) {
if (debug >= 1)
log(" Cancelled transaction, no validation");
return (true);
1.3 +10 -3
jakarta-struts/src/share/org/apache/struts/taglib/html/Constants.java
Index: Constants.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/Constants.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Constants.java 2001/01/07 04:37:06 1.2
+++ Constants.java 2001/02/23 21:13:10 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/Constants.java,v 1.2
2001/01/07 04:37:06 craigmcc Exp $
- * $Revision: 1.2 $
- * $Date: 2001/01/07 04:37:06 $
+ * $Header:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/Constants.java,v 1.3
2001/02/23 21:13:10 craigmcc Exp $
+ * $Revision: 1.3 $
+ * $Date: 2001/02/23 21:13:10 $
*
* ====================================================================
*
@@ -86,6 +86,13 @@
* The property under which a Cancel button press is reported.
*/
public static final String CANCEL_PROPERTY = Package + ".CANCEL";
+
+
+ /**
+ * The property under which a Cancel button press is reported, if the
+ * Cancel button is rendered as an image.
+ */
+ public static final String CANCEL_PROPERTY_X = Package + ".CANCEL.x";
/**
