diff options
author | Pekka Hyvönen <pekka@vaadin.com> | 2016-12-12 16:32:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-12 16:32:59 +0200 |
commit | e63b51a831676bdcc15b889c1636c0dcccbc0bc0 (patch) | |
tree | d1a9a81d394b9e44830d106bda0b5fed76dc596d /uitest | |
parent | f1f4be9dc2134270256d8338f9cac562bc1ba1fd (diff) | |
download | vaadin-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 'uitest')
5 files changed, 12 insertions, 7 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/UploadCssTest.java b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/UploadCssTest.java index 1fa591ebc0..4a54c127bb 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/uitest/components/UploadCssTest.java +++ b/uitest/src/main/java/com/vaadin/tests/components/uitest/components/UploadCssTest.java @@ -10,11 +10,11 @@ public class UploadCssTest { public UploadCssTest(TestSampler parent) { Upload up = new Upload(); up.setId("upload" + debugIdCounter++); + up.setImmediateMode(false); parent.addComponent(up); up = new Upload(); up.setId("upload" + debugIdCounter++); - up.setImmediateMode(true); parent.addComponent(up); } } diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/UploadNoSelection.java b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadNoSelection.java index 0c65c197bb..e2d5fa2f52 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/upload/UploadNoSelection.java +++ b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadNoSelection.java @@ -52,6 +52,7 @@ public class UploadNoSelection extends AbstractTestUIWithLog Upload u = new Upload("Upload", this); u.setId(UPLOAD_ID); u.setSizeUndefined(); + u.setImmediateMode(false); addComponent(u); diff --git a/uitest/src/main/java/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java index c38b307523..f8571a8e89 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java +++ b/uitest/src/main/java/com/vaadin/tests/components/upload/UploadTitleWithTooltip.java @@ -30,6 +30,7 @@ public class UploadTitleWithTooltip extends AbstractReindeerTestUI { protected void setup(VaadinRequest request) { Upload upload = new Upload(); upload.setDescription("tootlip"); + upload.setImmediateMode(false); addComponent(upload); } diff --git a/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java b/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java index 4e8c441b1e..a2270f7925 100644 --- a/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java +++ b/uitest/src/main/java/com/vaadin/tests/fonticon/FontIcons.java @@ -122,6 +122,9 @@ public class FontIcons extends AbstractReindeerTestUI { e.printStackTrace(); continue; } + if (c instanceof Upload) { + ((Upload) c).setImmediateMode(false); + } c.setCaption(clazz.getSimpleName()); c.setIcon(icon); gl.addComponent(c); diff --git a/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java b/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java index 30f472114e..4d08ec31f6 100644 --- a/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java +++ b/uitest/src/main/java/com/vaadin/tests/themes/valo/ImmediateUpload.java @@ -35,15 +35,15 @@ public class ImmediateUpload extends AbstractTestUI { @Override protected void setup(VaadinRequest request) { - // by default is not in immediate mode - Upload upload = new Upload(); - upload.setId("upload"); - addComponent(upload); - + // by default is in immediate mode (since 8.0) Upload immediateUpload = new Upload(); immediateUpload.setId("immediateupload"); - immediateUpload.setImmediateMode(true); addComponent(immediateUpload); + + Upload upload = new Upload(); + upload.setId("upload"); + upload.setImmediateMode(false); + addComponent(upload); } /* |