Author: gonzalo
Date: 2006-10-05 14:08:33 -0400 (Thu, 05 Oct 2006)
New Revision: 66299
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs
Log:
2006-10-05 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* HyperLink.cs: don't render the img tag 'by hand' but use an Image
instead, which takes care of the 0/0px case. Also set the ToolTip
property. Fixes bug #79585.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-10-05 17:40:32 UTC (rev 66298)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-10-05 18:08:33 UTC (rev 66299)
@@ -1,3 +1,9 @@
+2006-10-05 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * HyperLink.cs: don't render the img tag 'by hand' but use an Image
+ instead, which takes care of the 0/0px case. Also set the ToolTip
+ property. Fixes bug #79585.
+
2006-10-05 Igor Zelmanovich <[EMAIL PROTECTED]>
* DetailsView.cs: optimization for previous patch
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs
2006-10-05 17:40:32 UTC (rev 66298)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs
2006-10-05 18:08:33 UTC (rev 66299)
@@ -102,21 +102,21 @@
#endif
override void RenderContents (HtmlTextWriter w)
{
- if (HasControls ())
+ if (HasControls ()) {
base.RenderContents (w);
- else if (ImageUrl != "") {
- w.AddAttribute (HtmlTextWriterAttribute.Src,
ResolveClientUrl (ImageUrl));
-#if NET_2_0
- string s = Text;
- if (s.Length > 0)
- w.AddAttribute
(HtmlTextWriterAttribute.Alt, s);
- w.AddStyleAttribute
(HtmlTextWriterStyle.BorderWidth, "0px");
-#else
- w.AddAttribute (HtmlTextWriterAttribute.Alt,
Text);
- w.AddAttribute (HtmlTextWriterAttribute.Border,
"0");
-#endif
- w.RenderBeginTag (HtmlTextWriterTag.Img);
- w.RenderEndTag ();
+ return;
+ }
+ string image_url = ImageUrl;
+ if (image_url != "") {
+ Image img = new Image ();
+ img.ImageUrl = ResolveClientUrl (image_url);
+ string str = Text;
+ if (str != "")
+ img.AlternateText = str;
+ str = ToolTip;
+ if (str != "")
+ img.ToolTip = str;
+ img.RenderControl (w);
} else {
w.Write (Text);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
