Continued fix for #1475: setReadOnly(true) fails for: Checkbox, Button, Upload

Upload setReadonly(false) now disables iUpload on the client-side correctly.

svn changeset:4004/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IButton.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IButton.java
index 620cf3b3cc2c0ac9bffca01487d2ddf99f6a4798..4d0a27e2dcaa7b1ad99459e29d39aababab70bec 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IButton.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IButton.java
@@ -86,7 +86,7 @@ public class IButton extends Button implements Paintable {
             DOM.removeChild(getElement(), errorIndicatorElement);
             errorIndicatorElement = null;
         }
-
+        
         if (uidl.hasAttribute("readonly")) {
             setEnabled(false);
         }

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java
index bbe366cbd423ec21d5bbc000f009a43efd2308a6..84707dec69052a4504a4155eef45a02a76997056 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java
@@ -82,7 +82,7 @@ public class IUpload extends FormPanel implements Paintable, ClickListener,
         submitButton.setText(uidl.getStringAttribute("buttoncaption"));
         fu.setName(paintableId + "_file");
 
-        if (uidl.hasAttribute("disabled")) {
+        if (uidl.hasAttribute("disabled") || uidl.hasAttribute("readonly")) {
             disableUpload();
         } else if (uidl.getBooleanAttribute("state")) {
             enableUploaod();