You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2009/12/16 23:03:58 UTC
svn commit: r891448 -
/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
Author: ivaynberg
Date: Wed Dec 16 22:03:57 2009
New Revision: 891448
URL: http://svn.apache.org/viewvc?rev=891448&view=rev
Log:
WICKET-2602 Display upload progress bar only when a file is selected
Issue: WICKET-2602
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
Modified: wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java?rev=891448&r1=891447&r2=891448&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java (original)
+++ wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java Wed Dec 16 22:03:57 2009
@@ -102,7 +102,7 @@
* the file upload field to check for a file upload, or null to display the upload
* field for every submit of the given form
*/
- public UploadProgressBar(String id, final Form<?> form, final FileUploadField fileUploadField)
+ public UploadProgressBar(String id, final Form<?> form, FileUploadField fileUploadField)
{
super(id);
setOutputMarkupId(true);
@@ -130,6 +130,9 @@
log.warn("UploadProgressBar will not work without an UploadWebRequest. See the javadoc for details.");
}
+ final String fileUploadFieldMarkupId = fileUploadField == null ? ""
+ : fileUploadField.getMarkupId();
+
form.add(new AttributeModifier("onsubmit", true, new Model<String>()
{
@@ -141,8 +144,6 @@
{
ResourceReference ref = new ResourceReference(RESOURCE_NAME);
- String fileUploadFieldMarkupId = fileUploadField == null ? ""
- : fileUploadField.getMarkupId();
return "var def=new Wicket.WUPB.Def('" + form.getMarkupId() + "', '" +
statusDiv.getMarkupId() + "', '" + barDiv.getMarkupId() + "', '" +
getPage().urlFor(ref) + "','" + fileUploadFieldMarkupId +