minor changes for upload and its theme

svn changeset:8443/svn branch:6.0

5 files changed, 11 insertions, 3 deletions

diff --git a/WebContent/VAADIN/themes/base/styles.css b/WebContent/VAADIN/themes/base/styles.css
index e98bef219c..528c9dc4a9 100644
--- 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 ba96537ddb..d9299ae65c 100644
--- 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 b5bf3402e5..81993989c0 100644
--- 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 639e4cc992..265fdfb387 100644
--- 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 117d3ea267..56fc89a8f0 100644
--- 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) {