minor changes for upload and its theme

svn changeset:8443/svn branch:6.0

diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index e98bef219cb43a813383172ff03f384d498ad5fa..528c9dc4a94bc7aaf2ab02f9b2f2d889e0c9ba86 100644 (file)
--- a/WebContent/VAADIN/themes/base/styles.css
+++ b/WebContent/VAADIN/themes/base/styles.css
@@ -1441,6 +1441,7 @@ div.v-tree-node-leaf {
        position: relative;
        width: 10em;
        margin:0;
+       overflow:hidden;
 }
 
 .v-upload-immediate input {
@@ -1457,6 +1458,7 @@ div.v-tree-node-leaf {
        left:0;
        top:0;
        width:100%;
+       text-align:left;
 }
   
 

diff --git a/WebContent/VAADIN/themes/base/upload/upload.css b/WebContent/VAADIN/themes/base/upload/upload.css
index ba96537ddbf7218f48671f10998e4b2afc68b82d..d9299ae65c1a4b05f26a8c29d20c2aca6bce13f1 100644 (file)
--- a/WebContent/VAADIN/themes/base/upload/upload.css
+++ b/WebContent/VAADIN/themes/base/upload/upload.css
@@ -2,6 +2,7 @@
        position: relative;
        width: 10em;
        margin:0;
+       overflow:hidden;
 }
 
 .v-upload-immediate input {
@@ -18,5 +19,6 @@
        left:0;
        top:0;
        width:100%;
+       text-align:left;
 }
   
\ No newline at end of file

diff --git a/WebContent/VAADIN/themes/reindeer/styles.css b/WebContent/VAADIN/themes/reindeer/styles.css
index b5bf3402e52702a6e981d460aaefd7fbf0e22f5e..81993989c01bee27ed56f349bd731e58ee70ab0f 100644 (file)
--- a/WebContent/VAADIN/themes/reindeer/styles.css
+++ b/WebContent/VAADIN/themes/reindeer/styles.css
@@ -1441,6 +1441,7 @@ div.v-tree-node-leaf {
        position: relative;
        width: 10em;
        margin:0;
+       overflow:hidden;
 }
 
 .v-upload-immediate input {
@@ -1457,6 +1458,7 @@ div.v-tree-node-leaf {
        left:0;
        top:0;
        width:100%;
+       text-align:left;
 }
   
 

diff --git a/WebContent/VAADIN/themes/runo/styles.css b/WebContent/VAADIN/themes/runo/styles.css
index 639e4cc9926e8cb8b11b7e9d5a0ac44e08e3297b..265fdfb3870f36b5cd8336f5452c1f232ec23d5e 100644 (file)
--- a/WebContent/VAADIN/themes/runo/styles.css
+++ b/WebContent/VAADIN/themes/runo/styles.css
@@ -1441,6 +1441,7 @@ div.v-tree-node-leaf {
        position: relative;
        width: 10em;
        margin:0;
+       overflow:hidden;
 }
 
 .v-upload-immediate input {
@@ -1457,6 +1458,7 @@ div.v-tree-node-leaf {
        left:0;
        top:0;
        width:100%;
+       text-align:left;
 }
   
 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java
index 117d3ea26796e8b54ac0d0939af18d298ed148cd..56fc89a8f0ec6daa69101ee12144841532af38d4 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VUpload.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VUpload.java
@@ -153,13 +153,13 @@ public class VUpload extends FormPanel implements Paintable,
 
     protected void disableUpload() {
         submitButton.setEnabled(false);
-        fu.setVisible(false);
+        // fu.getElement().setPropertyBoolean("disabled", true);
         enabled = false;
     }
 
     protected void enableUploaod() {
         submitButton.setEnabled(true);
-        fu.setVisible(true);
+        // fu.getElement().setPropertyBoolean("disabled", false);
         enabled = true;
     }
 
@@ -172,7 +172,7 @@ public class VUpload extends FormPanel implements Paintable,
         panel.remove(fu);
         fu = new MyFileUpload();
         fu.setName(paintableId + "_file");
-        fu.setVisible(enabled);
+        // fu.getElement().setPropertyBoolean("disabled", !enabled);
         panel.add(fu);
         panel.add(submitButton);
         if (immediate) {