Author: benm
Date: 2005-09-23 18:23:33 -0400 (Fri, 23 Sep 2005)
New Revision: 50636
Modified:
trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
trunk/mcs/class/System.Web/Test/System.Web.UI/ChangeLog
trunk/mcs/class/System.Web/Test/System.Web.UI/HtmlTextWriterTest.cs
Log:
In Test/System.Web.UI:
2005-09-23 Ben Maurer <[EMAIL PROTECTED]>
* HtmlTextWriterTest.cs: Reenable some stuff
In System.Web.UI:
2005-09-23 Ben Maurer <[EMAIL PROTECTED]>
* HtmlTextWriter.cs: Initial support for escaping.
Modified: trunk/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2005-09-23 22:09:01 UTC
(rev 50635)
+++ trunk/mcs/class/System.Web/System.Web.UI/ChangeLog 2005-09-23 22:23:33 UTC
(rev 50636)
@@ -1,3 +1,7 @@
+2005-09-23 Ben Maurer <[EMAIL PROTECTED]>
+
+ * HtmlTextWriter.cs: Initial support for escaping.
+
2005-09-23 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* ViewStateOutputHashStream.cs: Removed. It didn't last long.
Modified: trunk/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs 2005-09-23
22:09:01 UTC (rev 50635)
+++ trunk/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs 2005-09-23
22:23:33 UTC (rev 50636)
@@ -137,22 +137,21 @@
b.Close ();
}
- [MonoTODO]
protected virtual string EncodeAttributeValue
(HtmlTextWriterAttribute attrKey, string value)
{
- return value;
+ return HttpUtility.HtmlEncode (value);
}
- [MonoTODO]
protected string EncodeAttributeValue (string value, bool
fEncode)
{
+ if (fEncode)
+ return HttpUtility.HtmlEncode (value);
return value;
}
- [MonoTODO]
protected string EncodeUrl (string url)
{
- return url;
+ return HttpUtility.UrlPathEncode (url);
}
Modified: trunk/mcs/class/System.Web/Test/System.Web.UI/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI/ChangeLog 2005-09-23
22:09:01 UTC (rev 50635)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI/ChangeLog 2005-09-23
22:23:33 UTC (rev 50636)
@@ -1,3 +1,7 @@
+2005-09-23 Ben Maurer <[EMAIL PROTECTED]>
+
+ * HtmlTextWriterTest.cs: Reenable some stuff
+
2005-09-21 Sebastien Pouliot <[EMAIL PROTECTED]>
* DataBindingHandlerAttributeTest.cs: Fixed test results in 2.0 RC
Modified: trunk/mcs/class/System.Web/Test/System.Web.UI/HtmlTextWriterTest.cs
===================================================================
--- trunk/mcs/class/System.Web/Test/System.Web.UI/HtmlTextWriterTest.cs
2005-09-23 22:09:01 UTC (rev 50635)
+++ trunk/mcs/class/System.Web/Test/System.Web.UI/HtmlTextWriterTest.cs
2005-09-23 22:23:33 UTC (rev 50636)
@@ -151,7 +151,6 @@
}
[Test]
- [Category ("NotWorking")]
public void EscapeJScript ()
{
w.AddAttribute (HtwAttribute.Onclick, "this.style.color
= \"red\"");
@@ -161,7 +160,6 @@
}
[Test]
- [Category ("NotWorking")]
public void EscapeUrl ()
{
w.AddAttribute (HtwAttribute.Href,
"http://www.google.com/search?hl=en&q=i+love+nunit&btnG=Google+Search";);
@@ -170,8 +168,9 @@
Assert.AreEqual ("<a
href=\"http://www.google.com/search?hl=en&q=i+love+nunit&btnG=Google+Search\";></a>",
sw.ToString ());
}
- [Test]
+ // Which attrs fall here
[Category ("NotWorking")]
+ [Test]
public void NoEscapeAttrName ()
{
w.AddAttribute (HtwAttribute.Name, "cookies&cream");
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
