diff options
| author | Jani Laakso <jani.laakso@itmill.com> | 2007-10-21 12:43:56 +0000 |
|---|---|---|
| committer | Jani Laakso <jani.laakso@itmill.com> | 2007-10-21 12:43:56 +0000 |
| commit | 2f195c5989d6bbf428f18041dfbe7eb948191c34 (patch) | |
| tree | b89c8af90a6f28b2527eeac6cb1f00b8b7b3485c | |
| parent | ec82644c78fc29c0ed7887cf22fb3875aa7d76d3 (diff) | |
| download | vaadin-framework-2f195c5989d6bbf428f18041dfbe7eb948191c34.tar.gz vaadin-framework-2f195c5989d6bbf428f18041dfbe7eb948191c34.zip | |
Fixed #1022 , at least for all layouts that use caption (wrapper) when handling general component changes such as icon, caption, errormsg.
svn changeset:2565/svn branch:trunk
| -rw-r--r-- | src/com/itmill/toolkit/terminal/gwt/client/Caption.java | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/Caption.java b/src/com/itmill/toolkit/terminal/gwt/client/Caption.java index c16db41e58..7a5887cd93 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/Caption.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/Caption.java @@ -14,6 +14,8 @@ public class Caption extends HTML { private Element errorIndicatorElement; + private Element icon; + private Element captionText; private ErrorMessage errorMessage; @@ -50,12 +52,26 @@ public class Caption extends HTML { DOM.setStyleAttribute(errorIndicatorElement, "display", "none"); } + if (uidl.hasAttribute("icon")) { + if (icon == null) { + icon = DOM.createImg(); + DOM.appendChild(getElement(), icon); + } + DOM.setElementAttribute(icon, "src", uidl + .getStringAttribute("icon")); + } else { + if (icon != null) + DOM.removeChild(getElement(), icon); + } + if (uidl.hasAttribute("caption")) { if (captionText == null) { captionText = DOM.createSpan(); DOM.appendChild(getElement(), captionText); } DOM.setInnerText(captionText, uidl.getStringAttribute("caption")); + } else { + // TODO should span also be removed } if (uidl.hasAttribute("description")) { |