aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/main/java/com/vaadin
diff options
context:
space:
mode:
authorPekka Hyvönen <pekka@vaadin.com>2016-12-12 16:32:59 +0200
committerGitHub <noreply@github.com>2016-12-12 16:32:59 +0200
commite63b51a831676bdcc15b889c1636c0dcccbc0bc0 (patch)
treed1a9a81d394b9e44830d106bda0b5fed76dc596d /server/src/main/java/com/vaadin
parentf1f4be9dc2134270256d8338f9cac562bc1ba1fd (diff)
downloadvaadin-framework-e63b51a831676bdcc15b889c1636c0dcccbc0bc0.tar.gz
vaadin-framework-e63b51a831676bdcc15b889c1636c0dcccbc0bc0.zip
Change Upload to be in immediate mode by default (#111)
Fixes vaadin/framework8-issues#547
Diffstat (limited to 'server/src/main/java/com/vaadin')
-rw-r--r--server/src/main/java/com/vaadin/ui/Upload.java12
1 files changed, 8 insertions, 4 deletions
diff --git a/server/src/main/java/com/vaadin/ui/Upload.java b/server/src/main/java/com/vaadin/ui/Upload.java
index 866bc96d25..d67fa07641 100644
--- a/server/src/main/java/com/vaadin/ui/Upload.java
+++ b/server/src/main/java/com/vaadin/ui/Upload.java
@@ -1128,11 +1128,13 @@ public class Upload extends AbstractComponent
/**
* Sets the immediate mode of the upload.
* <p>
- * If the upload is in immediate mode, it displays the browser file choosing
- * button immediately, whereas a non-immediate upload only shows a Vaadin
- * button.
+ * If the upload is in immediate mode, the file upload is started
+ * immediately after the user has selected the file.
* <p>
- * The default mode of an Upload component is non-immediate.
+ * If the upload is not in immediate mode, after selecting the file the user
+ * must click another button to start the upload.
+ * <p>
+ * The default mode of an Upload component is immediate.
*
* @param immediateMode
* {@code true} for immediate mode, {@code false} for not
@@ -1143,6 +1145,8 @@ public class Upload extends AbstractComponent
/**
* Returns the immediate mode of the upload.
+ * <p>
+ * The default mode of an Upload component is immediate.
*
* @return {@code true} if the upload is in immediate mode, {@code false} if
* the upload is not in immediate mode