[CONF] Confluence Changes in the last 24 hours
- This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache CXF 2.0 Documentation (CXF20DOC) http://cwiki.apache.org/confluence/display/CXF20DOC | |-Pages Added or Edited in This Space |-- Writing a service with Spring was last edited by njiang (08:09 AM). | http://cwiki.apache.org/confluence/display/CXF20DOC/Writing+a+service+with+Spring Apache ServiceMix (SM) http://cwiki.apache.org/confluence/display/SM | |-Pages Added or Edited in This Space |-- Team was last edited by rabi (12:50 PM). | http://cwiki.apache.org/confluence/display/SM/Team Apache Struts 2 Documentation (WW) http://cwiki.apache.org/confluence/display/WW | |-New Comments in This Space |-- http://cwiki.apache.org/confluence/display/WW/Redirect+Action+Result (1) |-- http://cwiki.apache.org/confluence/display/WW/date+validator (1) |-- http://cwiki.apache.org/confluence/display/WW/Localization (1) |-- http://cwiki.apache.org/confluence/display/WW/Localizing+Output (1) Apache Wicket (WICKET) http://cwiki.apache.org/confluence/display/WICKET | |-Pages Added or Edited in This Space |-- Articles about Wicket was last edited by [EMAIL PROTECTED] (01:09 PM). | http://cwiki.apache.org/confluence/display/WICKET/Articles+about+Wicket - CONFLUENCE INFORMATION This message is automatically generated by Confluence Unsubscribe or edit your notifications preferences http://cwiki.apache.org/confluence/users/viewnotifications.action If you think it was sent incorrectly contact one of the administrators http://cwiki.apache.org/confluence/administrators.action If you want more information on Confluence, or have a bug to report see http://www.atlassian.com/software/confluence
svn commit: r539888 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
Author: musachy
Date: Sun May 20 08:34:52 2007
New Revision: 539888
URL: http://svn.apache.org/viewvc?view=rev&rev=539888
Log:
WW-1764 Rename fremaker model
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java?view=diff&rev=539888&r1=539887&r2=539888
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/freemarker/tags/StrutsModels.java
Sun May 20 08:34:52 2007
@@ -102,7 +102,7 @@
return checkbox;
}
-public ComboBoxModel getComboBox() {
+public ComboBoxModel getCombobox() {
if (comboBox == null) {
comboBox = new ComboBoxModel(stack, req, res);
}
svn propchange: r539888 - svn:log
Author: musachy Revision: 539888 Modified property: svn:log Modified: svn:log at Sun May 20 08:35:40 2007 -- --- svn:log (original) +++ svn:log Sun May 20 08:35:40 2007 @@ -1 +1 @@ -WW-1764 Rename fremaker model +WW-1764 Rename fremarker tag model "comboBox" to "combobox"
svn commit: r539919 - in /struts/struts2/trunk/core/src/site/resources/tags/ajax: a.html bind.html div.html form.html submit.html tabbedpanel.html tree.html
Author: musachy Date: Sun May 20 12:41:17 2007 New Revision: 539919 URL: http://svn.apache.org/viewvc?view=rev&rev=539919 Log: Update ajax tags reference doc Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html struts/struts2/trunk/core/src/site/resources/tags/ajax/bind.html struts/struts2/trunk/core/src/site/resources/tags/ajax/div.html struts/struts2/trunk/core/src/site/resources/tags/ajax/form.html struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html struts/struts2/trunk/core/src/site/resources/tags/ajax/tabbedpanel.html struts/struts2/trunk/core/src/site/resources/tags/ajax/tree.html Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html?view=diff&rev=539919&r1=539918&r2=539919 == --- struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html Sun May 20 12:41:17 2007 @@ -44,6 +44,14 @@ Comma delimmited list of topics that will published after the request(if the request succeeds) + ajaxAfterValidation + false + false + true + Boolean + Make an asynchronous request if validation succeeds. Only valid is 'validate' is 'true' + + beforeNotifyTopics false @@ -374,7 +382,7 @@ showLoadingText false - true + false true Boolean Show loading text on targets @@ -458,6 +466,14 @@ true String Icon path used for image that will have the tooltip + + + validate + false + false + true + Boolean + Perform Ajax calidation. 'ajaxValidation' interceptor must be applied to action value Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/bind.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/bind.html?view=diff&rev=539919&r1=539918&r2=539919 == --- struts/struts2/trunk/core/src/site/resources/tags/ajax/bind.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/ajax/bind.html Sun May 20 12:41:17 2007 @@ -36,6 +36,14 @@ Comma delimmited list of topics that will published after the request(if the request succeeds) + ajaxAfterValidation + false + false + true + Boolean + Make an asynchronous request if validation succeeds. Only valid is 'validate' is 'true' + + beforeNotifyTopics false @@ -174,7 +182,7 @@ showLoadingText false - true + false true Boolean Show loading text on targets @@ -194,6 +202,14 @@ true String Comma delimited list of ids of the elements whose content will be updated +
svn commit: r539926 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/Date.java test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java
Author: musachy
Date: Sun May 20 12:53:59 2007
New Revision: 539926
URL: http://svn.apache.org/viewvc?view=rev&rev=539926
Log:
WW-1792 Date tag doesn't handle calendars
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java?view=diff&rev=539926&r1=539925&r2=539926
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Date.java
Sun May 20 12:53:59 2007
@@ -25,6 +25,7 @@
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Iterator;
import java.util.List;
@@ -274,9 +275,14 @@
String msg = null;
ValueStack stack = getStack();
java.util.Date date = null;
-// find the name on the valueStack, and cast it to a date
+// find the name on the valueStack
try {
-date = (java.util.Date) findValue(name);
+//suport Calendar also
+Object dateObject = findValue(name);
+if (dateObject instanceof java.util.Date)
+date = (java.util.Date) dateObject;
+else if(dateObject instanceof Calendar)
+date = ((Calendar) dateObject).getTime();
} catch (Exception e) {
LOG.error("Could not convert object with key '" + name
+ "' to a java.util.Date instance");
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java?view=diff&rev=539926&r1=539925&r2=539926
==
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/DateTagTest.java
Sun May 20 12:53:59 2007
@@ -51,6 +51,20 @@
tag.doEndTag();
assertEquals(formatted, writer.toString());
}
+
+public void testCustomFormatCalendar() throws Exception {
+String format = "/MM/dd hh:mm:ss";
+Calendar calendar = Calendar.getInstance();
+String formatted = new
SimpleDateFormat(format).format(calendar.getTime());
+context.put("myDate", calendar);
+
+tag.setName("myDate");
+tag.setNice(false);
+tag.setFormat(format);
+tag.doStartTag();
+tag.doEndTag();
+assertEquals(formatted, writer.toString());
+}
public void testDefaultFormat() throws Exception {
Date now = new Date();
svn commit: r539946 [1/3] - in /struts/struts2/trunk/plugins/dojo/src: main/java/org/apache/struts2/dojo/components/ main/java/org/apache/struts2/dojo/views/jsp/ui/ main/resources/org/apache/struts2/s
Author: musachy
Date: Sun May 20 14:29:37 2007
New Revision: 539946
URL: http://svn.apache.org/viewvc?view=rev&rev=539946
Log:
WW-1935 Tags Bind, Anchor and Submit, in the Dojo plugin should have a
"separateScripts" attribute to run scripts on their own scope
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteBean.java
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteTag.java
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/bind.ftl
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/div.ftl
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java
struts/struts2/trunk/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Bind-1.txt
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/div-1.txt
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/href-1.txt
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-2.txt
struts/struts2/trunk/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-3.txt
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java?view=diff&rev=539946&r1=539945&r2=539946
==
---
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java
Sun May 20 14:29:37 2007
@@ -49,6 +49,7 @@
protected String errorNotifyTopics;
protected String highlightColor;
protected String highlightDuration;
+protected String separateScripts;
public AbstractRemoteBean(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
@@ -94,6 +95,8 @@
addParameter("highlightColor", findString(highlightColor));
if (highlightDuration != null)
addParameter("highlightDuration", findString(highlightDuration));
+if (separateScripts != null)
+addParameter("separateScripts", findValue(separateScripts,
Boolean.class));
}
@Override
@@ -216,5 +219,10 @@
defaultValue = "2000", type="Integer")
public void setHighlightDuration(String highlightDuration) {
this.highlightDuration = highlightDuration;
+}
+
+@StrutsTagAttribute(description="Run scripts in a separate scope, unique
for each tag", defaultValue="true")
+public void setSeparateScripts(String separateScripts) {
+this.separateScripts = separateScripts;
}
}
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteBean.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteBean.java?view=diff&rev=539946&r1=539945&r2=539946
==
---
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteBean.java
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteBean.java
Sun May 20 14:29:37 2007
@@ -62,4 +62,6 @@
void setHighlightColor(String color);
void setHighlightDuration(String color);
+
+void setSeparateScripts(String separat
svn commit: r539946 [3/3] - in /struts/struts2/trunk/plugins/dojo/src: main/java/org/apache/struts2/dojo/components/ main/java/org/apache/struts2/dojo/views/jsp/ui/ main/resources/org/apache/struts2/s
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js?view=diff&rev=539946&r1=539945&r2=539946
==
---
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
Sun May 20 14:29:37 2007
@@ -22061,6 +22061,7 @@
dojo.widget.HtmlWidget, {
widgetType : "Bind",
executeScripts : false,
+ scriptSeparation : false,
targets : "",
targetsArray : null,
href : "",
@@ -22098,6 +22099,13 @@
validate : false,
ajaxAfterValidation : false,
+ //used for scripts downloading & caching
+ cacheContent : true,
+ //run script on its own scope
+ scriptSeparation : true,
+ //scope for the cript separation
+ scriptScope : null,
+
postCreate : function() {
var self = this;
@@ -22235,14 +22243,7 @@
if(this.executeScripts) {
//update targets content
var parsed = this.parse(data);
-//eval scripts
-if(parsed.scripts && parsed.scripts.length > 0) {
- var scripts = "";
- for(var i = 0; i < parsed.scripts.length; i++){
-scripts += parsed.scripts[i];
- }
- (new Function('_container_', scripts+'; return this;'))(this);
-}
+this._executeScripts(parsed.scripts);
this.setContent(parsed.text);
}
else {
@@ -22417,7 +22418,65 @@
text: s,
scripts: scripts
};
- }
+ },
+
+ //from Dojo content pane
+ _executeScripts : function (scripts) {
+var self = this;
+var tmp = "", code = "";
+for (var i = 0; i < scripts.length; i++) {
+if (scripts[i].path) {
+dojo.io.bind(this._cacheSetting({"url":scripts[i].path,
"load":function (type, scriptStr) {
+dojo.lang.hitch(self, tmp = ";" + scriptStr);
+}, "error":function (type, error) {
+error.text = type + " downloading remote script";
+self._handleDefaults.call(self, error, "onExecError", "debug");
+}, "mimetype":"text/plain", "sync":true}, this.cacheContent));
+code += tmp;
+} else {
+code += scripts[i];
+}
+}
+try {
+if (this.scriptSeparation) {
+delete this.scriptScope;
+this.scriptScope = new (new Function("_container_", code + ";
return this;"))(self);
+} else {
+var djg = dojo.global();
+if (djg.execScript) {
+djg.execScript(code);
+} else {
+var djd = dojo.doc();
+var sc = djd.createElement("script");
+sc.appendChild(djd.createTextNode(code));
+(this.containerNode || this.domNode).appendChild(sc);
+}
+}
+}
+catch (e) {
+e.text = "Error running scripts from content:\n" + e.description;
+this.log(e);
+}
+ },
+
+ _cacheSetting : function (bindObj, useCache) {
+for (var x in this.bindArgs) {
+if (dojo.lang.isUndefined(bindObj[x])) {
+bindObj[x] = this.bindArgs[x];
+}
+}
+if (dojo.lang.isUndefined(bindObj.useCache)) {
+bindObj.useCache = useCache;
+}
+if (dojo.lang.isUndefined(bindObj.preventCache)) {
+bindObj.preventCache = !useCache;
+}
+if (dojo.lang.isUndefined(bindObj.mimetype)) {
+bindObj.mimetype = "text/html";
+}
+return bindObj;
+ }
+
});
@@ -22774,7 +22833,7 @@
},
//from Dojo's ContentPane
-//TODO: remove when fixed on Dojo
+//TODO: remove when fixed on Dojo (WW-1869)
splitAndFixPaths:function (s, url) {
var titles = [], scripts = [], tmp = [];
var match = [], requires = [], attr = [], styles = [];
Modified:
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl?view=diff&rev=539946&r1=539945&r2=539946
==
---
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl
Sun May 20 14:29:37 2007
@@ -73,3 +73,6 @@
<#if parameters.highlightDuration?if_exists != "">
highlightDuration="${parameters.highlightDuration?html}"<#rt/>
+ <#if parameters.separateScripts?exists>
+scriptSeparation="${parameters.separateScripts?string?html}"<#rt/>
+
Modified:
struts/struts2/trunk/plugins/dojo/sr
svn commit: r539950 - in /struts/struts2/trunk/core/src/site/resources/tags/ajax: a.html bind.html submit.html
Author: musachy Date: Sun May 20 14:34:58 2007 New Revision: 539950 URL: http://svn.apache.org/viewvc?view=rev&rev=539950 Log: WW-1935 Tags Bind, Anchor and Submit, in the Dojo plugin should have a "separateScripts" attribute to run scripts on their own scope Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html struts/struts2/trunk/core/src/site/resources/tags/ajax/bind.html struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html?view=diff&rev=539950&r1=539949&r2=539950 == --- struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/ajax/a.html Sun May 20 14:34:58 2007 @@ -372,6 +372,14 @@ Define required position of required form element (left|right) + separateScripts + false + true + true + String + Run scripts in a separate scope, unique for each tag + + showErrorTransportText false true Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/bind.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/bind.html?view=diff&rev=539950&r1=539949&r2=539950 == --- struts/struts2/trunk/core/src/site/resources/tags/ajax/bind.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/ajax/bind.html Sun May 20 14:34:58 2007 @@ -172,6 +172,14 @@ Comma delimmited list of topics that will published before and after the request, and on errors + separateScripts + false + true + true + String + Run scripts in a separate scope, unique for each tag + + showErrorTransportText false true Modified: struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html?view=diff&rev=539950&r1=539949&r2=539950 == --- struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html (original) +++ struts/struts2/trunk/core/src/site/resources/tags/ajax/submit.html Sun May 20 14:34:58 2007 @@ -380,6 +380,14 @@ Define required position of required form element (left|right) + separateScripts + false + true + true + String + Run scripts in a separate scope, unique for each tag + + showErrorTransportText false true
svn commit: r539951 - /struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java
Author: musachy
Date: Sun May 20 14:35:18 2007
New Revision: 539951
URL: http://svn.apache.org/viewvc?view=rev&rev=539951
Log:
WW-1935 Tags Bind, Anchor and Submit, in the Dojo plugin should have a
"separateScripts" attribute to run scripts on their own scope
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java
Modified:
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java?view=diff&rev=539951&r1=539950&r2=539951
==
---
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java
(original)
+++
struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Bind.java
Sun May 20 14:35:18 2007
@@ -286,4 +286,9 @@
public void setAjaxAfterValidation(String ajaxAfterValidation) {
this.ajaxAfterValidation = ajaxAfterValidation;
}
+
+@StrutsTagAttribute(description="Run scripts in a separate scope, unique
for each tag", defaultValue="true")
+public void setSeparateScripts(String separateScripts) {
+this.separateScripts = separateScripts;
+}
}
svn commit: r539956 - in /struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms: index.jsp test1.jsp test2.jsp test3.jsp
Author: musachy
Date: Sun May 20 14:53:32 2007
New Revision: 539956
URL: http://svn.apache.org/viewvc?view=rev&rev=539956
Log:
Cleanup Remote Forms examples
Removed:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/test1.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/test2.jsp
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/test3.jsp
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/index.jsp
Modified:
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/index.jsp
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/index.jsp?view=diff&rev=539956&r1=539955&r2=539956
==
---
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/index.jsp
(original)
+++
struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remoteforms/index.jsp
Sun May 20 14:53:32 2007
@@ -8,9 +8,9 @@
-dojo.event.topic.subscribe("/beforeSubmit", function(data, type, e) {
-alert('you can manipulate the form before it gets submitted. To
cancel the submit event set e.cancel=true');
-e.cancel = true;
+dojo.event.topic.subscribe("/beforeSubmit", function(event, widget) {
+alert('you can manipulate the form before it gets submitted. To
cancel the submit event set event.cancel=true');
+event.cancel = true;
});
@@ -23,7 +23,7 @@
Remote form replacing another div:
-
-
+
Remote form replacing the forms content:
-
-
+
Remote form evaluating suplied JS on completion:
-
-
+
Remote form whose submit is cancelled:
-
-
+
A form with no remote submit (so should not be ajaxified):
svn commit: r539953 - /struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp
Author: musachy Date: Sun May 20 14:45:36 2007 New Revision: 539953 URL: http://svn.apache.org/viewvc?view=rev&rev=539953 Log: Add showLoadingText to link that shows how to use custom loading text Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp URL: http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp?view=diff&rev=539953&r1=539952&r2=539953 == --- struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp (original) +++ struts/struts2/trunk/apps/showcase/src/main/webapp/ajax/remotelink/index.jsp Sun May 20 14:45:36 2007 @@ -84,6 +84,7 @@ Update 'Div 1', use custom loading message
svn commit: r539996 - /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java
Author: jmitchell Date: Sun May 20 19:17:53 2007 New Revision: 539996 URL: http://svn.apache.org/viewvc?view=rev&rev=539996 Log: WW-1834 Fix documentation for snippet used by cwiki Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java?view=diff&rev=539996&r1=539995&r2=539996 == --- struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java (original) +++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java Sun May 20 19:17:53 2007 @@ -95,7 +95,7 @@ * <-- Redirect to an action in the same namespace --> ** * *dashboard.jsp - *error *
