Author: robertj
Date: 2006-08-09 09:17:11 -0400 (Wed, 09 Aug 2006)
New Revision: 63536
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/DataControlButton.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs
trunk/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs
Log:
2006-08-09 Robert Jordan <[EMAIL PROTECTED]>
* DataControlButton.cs, Image.cs, AdRotator.cs, HyperLink.cs:
replace ResolveUrl with ResolveClientUrl to match MS.NET's
behaviour. Fixes bug #77539.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
2006-08-09 13:01:40 UTC (rev 63535)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
2006-08-09 13:17:11 UTC (rev 63536)
@@ -108,13 +108,13 @@
base.AddAttributesToRender (w);
if (e.NavigateUrl != null)
- w.AddAttribute (HtmlTextWriterAttribute.Href,
ResolveUrl (e.NavigateUrl));
+ w.AddAttribute (HtmlTextWriterAttribute.Href,
ResolveClientUrl (e.NavigateUrl));
w.AddAttribute (HtmlTextWriterAttribute.Target, Target);
w.RenderBeginTag (HtmlTextWriterTag.A);
if (e.NavigateUrl != null)
- w.AddAttribute (HtmlTextWriterAttribute.Src,
ResolveUrl (e.ImageUrl));
+ w.AddAttribute (HtmlTextWriterAttribute.Src,
ResolveClientUrl (e.ImageUrl));
w.AddAttribute (HtmlTextWriterAttribute.Alt,
e.AlternateText == null ? "" : e.AlternateText);
w.AddAttribute (HtmlTextWriterAttribute.Border, "0");
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-08-09 13:01:40 UTC (rev 63535)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2006-08-09 13:17:11 UTC (rev 63536)
@@ -1,3 +1,9 @@
+2006-08-09 Robert Jordan <[EMAIL PROTECTED]>
+
+ * DataControlButton.cs, Image.cs, AdRotator.cs, HyperLink.cs:
+ replace ResolveUrl with ResolveClientUrl to match MS.NET's
+ behaviour. Fixes bug #77539.
+
2006-08-09 Igor Zelmanovich <[EMAIL PROTECTED]>
* HierarchicalDataBoundControl.cs: fixed DataBind flow
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/DataControlButton.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/DataControlButton.cs
2006-08-09 13:01:40 UTC (rev 63535)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/DataControlButton.cs
2006-08-09 13:17:11 UTC (rev 63536)
@@ -118,7 +118,7 @@
if (ButtonType == ButtonType.Image) {
writer.AddAttribute
(HtmlTextWriterAttribute.Type, "image");
- writer.AddAttribute
(HtmlTextWriterAttribute.Src, ResolveUrl (ImageUrl));
+ writer.AddAttribute
(HtmlTextWriterAttribute.Src, ResolveClientUrl (ImageUrl));
if (callScript != null)
writer.AddAttribute
(HtmlTextWriterAttribute.Onclick, callScript);
else
@@ -156,7 +156,7 @@
else {
if (ImageUrl.Length > 0) {
ControlStyle.AddAttributesToRender
(writer);
- writer.AddAttribute
(HtmlTextWriterAttribute.Src, ResolveUrl (ImageUrl));
+ writer.AddAttribute
(HtmlTextWriterAttribute.Src, ResolveClientUrl (ImageUrl));
if (Text.Length > 0)
writer.AddAttribute
(HtmlTextWriterAttribute.Alt, Text);
writer.AddStyleAttribute
(HtmlTextWriterStyle.BorderWidth, "0px");
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs
2006-08-09 13:01:40 UTC (rev 63535)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs
2006-08-09 13:17:11 UTC (rev 63536)
@@ -59,7 +59,7 @@
// add attributes - only if they're not empty
string s = NavigateUrl;
if (s.Length > 0)
- w.AddAttribute (HtmlTextWriterAttribute.Href,
ResolveUrl (s));
+ w.AddAttribute (HtmlTextWriterAttribute.Href,
ResolveClientUrl (s));
s = Target;
if (s.Length > 0)
w.AddAttribute (HtmlTextWriterAttribute.Target,
s);
@@ -103,7 +103,7 @@
if (HasControls ())
base.RenderContents (w);
else if (ImageUrl != "") {
- w.AddAttribute (HtmlTextWriterAttribute.Src,
ResolveUrl (ImageUrl));
+ w.AddAttribute (HtmlTextWriterAttribute.Src,
ResolveClientUrl (ImageUrl));
#if NET_2_0
string s = Text;
if (s.Length > 0)
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs
2006-08-09 13:01:40 UTC (rev 63535)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs
2006-08-09 13:17:11 UTC (rev 63536)
@@ -174,19 +174,19 @@
base.AddAttributesToRender (writer);
#if NET_2_0
// src is always present, even if empty, in 2.0
- writer.AddAttribute (HtmlTextWriterAttribute.Src,
ResolveUrl (ImageUrl));
+ writer.AddAttribute (HtmlTextWriterAttribute.Src,
ResolveClientUrl (ImageUrl));
string s = AlternateText;
if ((s.Length > 0) || GenerateEmptyAlternateText)
writer.AddAttribute
(HtmlTextWriterAttribute.Alt, s);
s = DescriptionUrl;
if (s.Length > 0)
- writer.AddAttribute
(HtmlTextWriterAttribute.Longdesc, ResolveUrl (s));
+ writer.AddAttribute
(HtmlTextWriterAttribute.Longdesc, ResolveClientUrl (s));
#else
// alt is always present, even if empty, in 1.x
writer.AddAttribute (HtmlTextWriterAttribute.Alt,
AlternateText);
string s = ImageUrl;
if (s.Length > 0)
- writer.AddAttribute
(HtmlTextWriterAttribute.Src, ResolveUrl (s));
+ writer.AddAttribute
(HtmlTextWriterAttribute.Src, ResolveClientUrl (s));
// added in Fx 1.1 SP1 but the HtmlTextWriterAttribute
wasn't
s = DescriptionUrl;
if (s.Length > 0)
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
