#6630 improved submitUpload so that upload started listeners now trigger server side...

svn changeset:20781/svn branch:6.6

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java
index a49450e0863fd50581d75a558c5a7c944207fae5..25fd1d7604f7bbe93ede20eb869eeb8338778c22 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java
@@ -157,7 +157,7 @@ public class VUpload extends SimplePanel implements Paintable {
             return;
         }
         if (uidl.hasAttribute("forceSubmit")) {
-            element.submit();
+            submit();
             return;
         }
         setImmediate(uidl.getBooleanAttribute("immediate"));

diff --git a/tests/src/com/vaadin/tests/components/upload/ForceSubmit.java b/tests/src/com/vaadin/tests/components/upload/ForceSubmit.java
index fef82dd96259977430bf530532b484af44431e3a..9f5c2b67e20fe296bd87d47b83a8f7de7e8c846c 100644 (file)
--- a/tests/src/com/vaadin/tests/components/upload/ForceSubmit.java
+++ b/tests/src/com/vaadin/tests/components/upload/ForceSubmit.java
@@ -5,12 +5,14 @@ import java.io.OutputStream;
 \r
 import com.vaadin.tests.components.TestBase;\r
 import com.vaadin.ui.Button;\r
+import com.vaadin.ui.Button.ClickEvent;\r
 import com.vaadin.ui.Button.ClickListener;\r
+import com.vaadin.ui.TextField;\r
 import com.vaadin.ui.Upload;\r
-import com.vaadin.ui.Button.ClickEvent;\r
 import com.vaadin.ui.Upload.FailedEvent;\r
 import com.vaadin.ui.Upload.FinishedEvent;\r
 import com.vaadin.ui.Upload.Receiver;\r
+import com.vaadin.ui.Upload.StartedEvent;\r
 \r
 public class ForceSubmit extends TestBase implements Receiver {\r
 \r
@@ -26,6 +28,9 @@ public class ForceSubmit extends TestBase implements Receiver {
     @Override\r
     protected void setup() {\r
 \r
+        final TextField textField = new TextField("Test field");\r
+        addComponent(textField);\r
+\r
         final Upload u;\r
 \r
         u = new Upload("Upload", this);\r
@@ -49,6 +54,13 @@ public class ForceSubmit extends TestBase implements Receiver {
             }\r
         });\r
 \r
+        u.addListener(new Upload.StartedListener() {\r
+            public void uploadStarted(StartedEvent event) {\r
+                getMainWindow().showNotification(\r
+                        "Started upload. TF value :" + textField.getValue());\r
+            }\r
+        });\r
+\r
         Button button = new Button(\r
                 "I'm an external button (not the uploads builtin), hit me to start upload.");\r
         button.addListener(new ClickListener() {\r
@@ -63,11 +75,11 @@ public class ForceSubmit extends TestBase implements Receiver {
 \r
     @Override\r
     protected String getDescription() {\r
-        return "Some wireframists are just so web 1.0. If requirements " +\r
-                       "say the upload must not start until the whole form " +\r
-                       "is 'Oukeyd', that is what we gotta do. In these cases " +\r
-                       "developers most probably also want to hide the uploads" +\r
-                       " internal button by setting its caption to null.";\r
+        return "Some wireframists are just so web 1.0. If requirements "\r
+                + "say the upload must not start until the whole form "\r
+                + "is 'Oukeyd', that is what we gotta do. In these cases "\r
+                + "developers most probably also want to hide the uploads"\r
+                + " internal button by setting its caption to null.";\r
     }\r
 \r
 }\r