From 3a7672a07651ac11b42a80fcd0ba83983f752a24 Mon Sep 17 00:00:00 2001 From: Jani Laakso Date: Fri, 7 Mar 2008 14:09:37 +0000 Subject: [PATCH] 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 --- src/com/itmill/toolkit/terminal/gwt/client/ui/IButton.java | 2 +- src/com/itmill/toolkit/terminal/gwt/client/ui/IUpload.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 620cf3b3cc..4d0a27e2dc 100644 --- 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 bbe366cbd4..84707dec69 100644 --- 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(); -- 2.39.5