Updated Branches: refs/heads/wicket-1.5.x d7e019152 -> 2a09c11e0
WICKET-4623 Added upload progress to ajax upload example Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2a09c11e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2a09c11e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2a09c11e Branch: refs/heads/wicket-1.5.x Commit: 2a09c11e091bdc3080b93a46ccb6c978a500e9ff Parents: d7e0191 Author: svenmeier <[email protected]> Authored: Fri Nov 2 22:08:04 2012 +0100 Committer: svenmeier <[email protected]> Committed: Fri Nov 2 22:08:04 2012 +0100 ---------------------------------------------------------------------- .../examples/ajax/builtin/AjaxApplication.java | 2 + .../examples/ajax/builtin/FileUploadPage.html | 3 +- .../examples/ajax/builtin/FileUploadPage.java | 18 ++++++++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/2a09c11e/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java index 75f4149..a276d99 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/AjaxApplication.java @@ -45,6 +45,8 @@ public class AjaxApplication extends WicketExampleApplication { super.init(); + getApplicationSettings().setUploadProgressUpdatesEnabled(true); + getResourceSettings().setThrowExceptionOnMissingResource(false); getRequestCycleSettings().addResponseFilter(new AjaxServerAndClientTimeFilter()); http://git-wip-us.apache.org/repos/asf/wicket/blob/2a09c11e/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.html ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.html b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.html index c6e9eff..9351d4c 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.html +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.html @@ -8,7 +8,8 @@ Demonstrates Wicket's ability to transparently handle multipart forms via AJAX.< <form wicket:id="form"> Text field: <input wicket:id="text" type="text"/><br/> - File field: <input wicket:id="file" type="file"/> (1MB max)<br/><br/> + File field: <input wicket:id="file" type="file"/> (<span wicket:id="max"></span> max)<br/><br/> + <div wicket:id="progress"></div> <input type="submit" value="Regular Submit"/> <input wicket:id="ajaxSubmit" type="button" value="Ajax Submit"/> </form> http://git-wip-us.apache.org/repos/asf/wicket/blob/2a09c11e/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java ---------------------------------------------------------------------- diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java index fa8448e..58d23dc 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/FileUploadPage.java @@ -19,11 +19,14 @@ package org.apache.wicket.examples.ajax.builtin; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxButton; +import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar; +import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.TextField; import org.apache.wicket.markup.html.form.upload.FileUpload; import org.apache.wicket.markup.html.form.upload.FileUploadField; import org.apache.wicket.markup.html.panel.FeedbackPanel; +import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.lang.Bytes; @@ -48,7 +51,7 @@ public class FileUploadPage extends BasePage add(feedback); // create the form - Form<?> form = new Form<Void>("form") + final Form<?> form = new Form<Void>("form") { /** * @see org.apache.wicket.markup.html.form.Form#onSubmit() @@ -79,6 +82,19 @@ public class FileUploadPage extends BasePage // create the file upload field form.add(file = new FileUploadField("file")); + form.add(new Label("max", new AbstractReadOnlyModel<String>() + { + private static final long serialVersionUID = 1L; + + @Override + public String getObject() + { + return form.getMaxSize().toString(); + } + })); + + form.add(new UploadProgressBar("progress", form, file)); + // create the ajax button used to submit the form form.add(new AjaxButton("ajaxSubmit") {
