2008-10-24 Marek Habersack <mhabersack@novell.com>

[mono.git] / mcs / class / System.Web / System.Web.UI.HtmlControls / HtmlTextArea.cs

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTextArea.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTextArea.cs
index fd768c991a630388d3ffa415caaa7ea9e6a7f641..fac5b1e9bf12bb6989d096bcc0b6277ebf437450 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTextArea.cs
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTextArea.cs
@@ -42,10 +42,9 @@ namespace System.Web.UI.HtmlControls {
 #if NET_2_0
        [SupportsEventValidation]
 #endif
-       public class HtmlTextArea : HtmlContainerControl, IPostBackDataHandler {
-
-               private static readonly object serverChangeEvent = new object ();
-
+       public class HtmlTextArea : HtmlContainerControl, IPostBackDataHandler 
+       {
+               static readonly object serverChangeEvent = new object ();
 
                public HtmlTextArea ()
                        : base ("textarea")
@@ -75,7 +74,7 @@ namespace System.Web.UI.HtmlControls {
                [WebSysDescription("")]
                [WebCategory("Behavior")]
                public virtual string Name {
-                       get { return ID; }
+                       get { return UniqueID; }
                        set { ; }
                }
 
@@ -101,8 +100,8 @@ namespace System.Web.UI.HtmlControls {
                [WebSysDescription("")]
                [WebCategory("Appearance")]
                public string Value {
-                       get { return InnerHtml; }
-                       set { InnerHtml = value; }
+                       get { return InnerText; }
+                       set { InnerText = value; }
                }
 
 
@@ -123,8 +122,11 @@ namespace System.Web.UI.HtmlControls {
                {
                        base.OnPreRender (e);
 
-                       if (Page != null) {
+                       if (Page != null && !Disabled) {
                                Page.RegisterRequiresPostBack (this);
+#if NET_2_0
+                               Page.RegisterEnabledControl (this);
+#endif
                        }
                }
 
@@ -137,6 +139,10 @@ namespace System.Web.UI.HtmlControls {
 
                protected override void RenderAttributes (HtmlTextWriter writer)
                {
+#if NET_2_0
+                       if (Page != null)
+                               Page.ClientScript.RegisterForEventValidation (UniqueID);
+#endif
                        if (Attributes ["name"] == null) {
                                writer.WriteAttribute ("name", Name);
                        }
@@ -151,6 +157,7 @@ namespace System.Web.UI.HtmlControls {
 
                protected virtual void RaisePostDataChangedEvent ()
                {
+                       ValidateEvent (UniqueID, String.Empty);
                        OnServerChange (EventArgs.Empty);
                }
 #endif