Author: ivaynberg
Date: Wed Dec 16 22:03:46 2009
New Revision: 891447
URL: http://svn.apache.org/viewvc?rev=891447&view=rev
Log:
WICKET-2602 Display upload progress bar only when a file is selected
Issue: WICKET-2602
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
Modified:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java?rev=891447&r1=891446&r2=891447&view=diff
==============================================================================
---
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
(original)
+++
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/UploadProgressBar.java
Wed Dec 16 22:03:46 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);
@@ -134,6 +134,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>()
{
@@ -145,8 +148,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 +
