* TextBox.cs: implemented AutoCompleteType property, fixed AddAttributesToRender

* TextBoxTest.cs: removed NotWorking attribute

svn path=/trunk/mcs/; revision=71592

4 files changed, 67 insertions, 9 deletions

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
index 5d9991f75bc..9c234f31ab5 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-24  Vladimir Krasnov  <vladimirk@mainsoft.com>
+
+	* TextBox.cs: implemented AutoCompleteType property, fixed
+	AddAttributesToRender
+
 2007-01-24  Ilya Kharmatsky <ilya -at- decode-systems.com>
 	
 	* DetailsView.cs: fixed problems with rendering of control, when
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs
index fcaa0b044be..5d18246ae02 100644
--- a/mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs
@@ -55,6 +55,43 @@ namespace System.Web.UI.WebControls {
 	, IEditableTextControl, ITextControl
 #endif		  
 	{
+#if NET_2_0
+		readonly static string [] VCardValues = new string [] {
+			null,
+			null,
+			"vCard.Cellular",
+			"vCard.Company",
+			"vCard.Department",
+			"vCard.DisplayName",
+			"vCard.Email",
+			"vCard.FirstName",
+			"vCard.Gender",
+			"vCard.Home.City",
+			"HomeCountry",
+			"vCard.Home.Fax",
+			"vCard.Home.Phone",
+			"vCard.Home.State",
+			"vCard.Home.StreetAddress",
+			"vCard.Home.ZipCode",
+			"vCard.Home.page",
+			"vCard.JobTitle",
+			"vCard.LastName",
+			"vCard.MiddleName",
+			"vCard.Notes",
+			"vCard.Office",
+			"vCard.Pager",
+			"vCard.Business.City",
+			"BusinessCountry",
+			"vCard.Business.Fax",
+			"vCard.Business.Phone",
+			"vCard.Business.State",
+			"vCard.Business.StreetAddress",
+			"vCard.Business.Url",
+			"vCard.Business.ZipCode",
+			"search"
+		};
+#endif
+
 		protected override void AddAttributesToRender (HtmlTextWriter w)
 		{
 			if (Page != null)
@@ -69,8 +106,18 @@ namespace System.Web.UI.WebControls {
 			case TextBoxMode.MultiLine:
 				if (Columns != 0)
 					w.AddAttribute (HtmlTextWriterAttribute.Cols, Columns.ToString ());
+#if NET_2_0
+				else
+					w.AddAttribute (HtmlTextWriterAttribute.Cols, "20");
+#endif
+				
 				if (Rows != 0)
 					w.AddAttribute (HtmlTextWriterAttribute.Rows, Rows.ToString ());
+#if NET_2_0
+				else
+					w.AddAttribute (HtmlTextWriterAttribute.Rows, "2");
+#endif
+
 				if (!Wrap)
 					w.AddAttribute (HtmlTextWriterAttribute.Wrap, "off");
 				
@@ -92,6 +139,14 @@ namespace System.Web.UI.WebControls {
 		
 				if (MaxLength != 0)
 					w.AddAttribute (HtmlTextWriterAttribute.Maxlength, MaxLength.ToString ());
+
+#if NET_2_0
+				if (AutoCompleteType != AutoCompleteType.None && TextMode == TextBoxMode.SingleLine)
+					if (AutoCompleteType != AutoCompleteType.Disabled)
+						w.AddAttribute (HtmlTextWriterAttribute.VCardName, VCardValues [(int) AutoCompleteType]);
+					else
+						w.AddAttribute (HtmlTextWriterAttribute.AutoComplete, "off");
+#endif
 				break;	
 			}
 
@@ -232,14 +287,14 @@ namespace System.Web.UI.WebControls {
 #if NET_2_0
 		[DefaultValue (AutoCompleteType.None)]
 		[Themeable (false)]
-		[MonoTODO ("Not implemented")]
 		public virtual AutoCompleteType AutoCompleteType 
 		{
 			get {
-				throw new NotImplementedException ();
+				object o = ViewState ["AutoCompleteType"];
+				return o != null ? (AutoCompleteType) o : AutoCompleteType.None;
 			}
 			set {
-				throw new NotImplementedException ();
+				ViewState ["AutoCompleteType"] = value;
 			}
 		}
 #endif		
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
index cf6a0060b61..7d9096d6aee 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ChangeLog
@@ -1,5 +1,9 @@
 2007-01-24  Vladimir Krasnov  <vladimirk@mainsoft.com>
 
+	* TextBoxTest.cs: removed NotWorking attribute
+
+2007-01-24  Vladimir Krasnov  <vladimirk@mainsoft.com>
+
 	* TableTest.cs: removed NotWorking attribute
 
 2007-01-24 Ilya Kharmatsky <ilya -at- decode-systems.com>
diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/TextBoxTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/TextBoxTest.cs
index 5a63ca4d12f..1912ef0f896 100644
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/TextBoxTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/TextBoxTest.cs
@@ -95,7 +95,6 @@ namespace MonoTests.System.Web.UI.WebControls {
 		}
 
 		[Test]
-		[Category("NotWorking")]
 		public void Defaults_NotWorking ()
 		{
 			Poker p = new Poker ();
@@ -105,7 +104,6 @@ namespace MonoTests.System.Web.UI.WebControls {
 		}
 
 		[Test]
-		[Category ("NotWorking")]
 		public void MultilineRenderEscape ()
 		{
 			Poker t = new Poker ();
@@ -160,7 +158,6 @@ namespace MonoTests.System.Web.UI.WebControls {
 		}
 
 		[Test]
-		[Category ("NotWorking")]
 		public void ValidationRender ()
 		{
 			/* test to show that the validation settings
@@ -256,7 +253,6 @@ namespace MonoTests.System.Web.UI.WebControls {
 
 		[Test]
 		[Category ("NunitWeb")]
-		[Category ("NotWorking")]
 		public void LoadPostData_Flow ()  //Just flow and not implementation detail
 		{
 			WebTest t = new WebTest (PageInvoker.CreateOnLoad (LoadPostData_Load));
@@ -302,7 +298,6 @@ namespace MonoTests.System.Web.UI.WebControls {
 		}
 
 		[Test]
-		[Category ("NotWorking")]
 		[Category ("NunitWeb")]
 		public void LoadPostData ()  
 		{
@@ -372,7 +367,6 @@ namespace MonoTests.System.Web.UI.WebControls {
 		}
 
 		[Test]
-		[Category ("NotWorking")] // Not implemented
 		public void AutoCompleteType_Test ()
 		{
 			WebTest t = new WebTest ("NoEventValidation.aspx");