From 5bd6784d40273cbf3c0833be4d8faf1589bc036d Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Wed, 6 Feb 2008 07:53:07 +0000 Subject: [PATCH] rename target width attribute in uidl to avoid collapsing with Sizeable width svn changeset:3713/svn branch:trunk --- .../toolkit/terminal/gwt/client/ui/ILink.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ILink.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ILink.java index 690321f55b..99b296f222 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ILink.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ILink.java @@ -34,9 +34,9 @@ public class ILink extends HTML implements Paintable, ClickListener { private boolean readonly; - private int width; + private int targetWidth; - private int height; + private int targetHeight; private Element errorIndicatorElement; @@ -81,9 +81,10 @@ public class ILink extends HTML implements Paintable, ClickListener { borderStyle = BORDER_STYLE_DEFAULT; } - height = uidl.hasAttribute("height") ? uidl.getIntAttribute("height") - : -1; - width = uidl.hasAttribute("width") ? uidl.getIntAttribute("width") : -1; + targetHeight = uidl.hasAttribute("height") ? uidl + .getIntAttribute("targetHeight") : -1; + targetWidth = uidl.hasAttribute("width") ? uidl + .getIntAttribute("targetHeidth") : -1; // Set link caption DOM.setInnerText(captionElement, uidl.getStringAttribute("caption")); @@ -141,13 +142,13 @@ public class ILink extends HTML implements Paintable, ClickListener { break; } - if (width > 0) { + if (targetWidth > 0) { features += (features.length() > 0 ? "," : "") + "width=" - + width; + + targetWidth; } - if (height > 0) { + if (targetHeight > 0) { features += (features.length() > 0 ? "," : "") + "height=" - + height; + + targetHeight; } Window.open(src, target, features); -- 2.39.5