coliver 2003/04/27 22:37:05
Modified: src/scratchpad/src/org/apache/cocoon/components/jxforms/flow
jxForm.js
src/scratchpad/webapp/samples/jxforms sitemap.xmap
src/scratchpad/webapp/samples/jxforms/view confirm.xml
end.xml
Log:
Fixed webapp sample
Revision Changes Path
1.4 +4 -4
cocoon-2.1/src/scratchpad/src/org/apache/cocoon/components/jxforms/flow/jxForm.js
Index: jxForm.js
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/components/jxforms/flow/jxForm.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jxForm.js 27 Apr 2003 22:13:35 -0000 1.3
+++ jxForm.js 28 Apr 2003 05:37:05 -0000 1.4
@@ -157,6 +157,7 @@
if (bizData == undefined) {
bizData = null;
}
+ this.lastWebContinuation = wk;
this.cocoon.forwardTo("cocoon://" +
this.cocoon.environment.getURIPrefix() + uri,
bizData, wk);
@@ -176,10 +177,10 @@
*/
JXForm.prototype.sendView = function(uri, validator) {
var lastWebCont = this.lastWebContinuation;
+ // create a continuation, the invocation of which will resend
+ // the page: this is used to implement <xf:submit continuation="back">
var wk = this.start(lastWebCont);
while (true) {
- // create a continuation, the invocation of which will resend
- // the page: this is used to implement <xf:submit
continuation="back">
if (this.cocoon.request == null) {
// this continuation has been invalidated
this.dead = true;
@@ -245,9 +246,8 @@
if (this.rootContinuation != null) {
this.rootContinuation.invalidate();
this.rootContinuation = null;
- this.lastContinuation = null;
+ this.lastWebContinuation = null;
}
-
}
/**
1.2 +1 -1
cocoon-2.1/src/scratchpad/webapp/samples/jxforms/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/jxforms/sitemap.xmap,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap.xmap 27 Apr 2003 01:57:04 -0000 1.1
+++ sitemap.xmap 28 Apr 2003 05:37:05 -0000 1.2
@@ -52,7 +52,7 @@
<map:parameter name="id" value="form-feedback"/>
<map:parameter name="schema-ns"
value="http://www.ascc.net/xml/schematron"/>
<map:parameter name="validator-schema"
value="schematron/wizard-xmlform-sch-report.xml"/>
- <map:parameter name="scope" value="session"/>
+ <map:parameter name="scope" value="request"/>
</map:call>
</map:match>
1.2 +1 -1
cocoon-2.1/src/scratchpad/webapp/samples/jxforms/view/confirm.xml
Index: confirm.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/jxforms/view/confirm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- confirm.xml 27 Apr 2003 01:57:05 -0000 1.1
+++ confirm.xml 28 Apr 2003 05:37:05 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document xmlns:xf="http://cocoon.apache.org/jxforms/2002/cr";>
- <xf:form id="form-feedback" view="confirm" action="">
+ <xf:form id="form-feedback" view="confirm" action="" method="GET">
<xf:label>Confirm Input</xf:label>
<!-- from page1 -->
<xf:output ref="firstName">
1.2 +1 -1
cocoon-2.1/src/scratchpad/webapp/samples/jxforms/view/end.xml
Index: end.xml
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/scratchpad/webapp/samples/jxforms/view/end.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- end.xml 27 Apr 2003 01:57:05 -0000 1.1
+++ end.xml 28 Apr 2003 05:37:05 -0000 1.2
@@ -21,7 +21,7 @@
<tr>
<td align="center">
<h3>
- <a href="..">Go to home page.</a>
+ <a href="../scratchpad">Go to home page.</a>
</h3>
</td>
</tr>
