Przeglądaj źródła

merge r96245:96256:

2008-02-20 Igor Zelmanovich <[email protected]>

	* Login.cs: render id attribute of root element correctly.


svn path=/trunk/mcs/; revision=96247
Igor Zelmanovich 18 lat temu
rodzic
commit
5683fb6e96

+ 4 - 0
mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog

@@ -1,3 +1,7 @@
+2008-02-20 Igor Zelmanovich <[email protected]>
+
+	* Login.cs: render id attribute of root element correctly.
+
 2008-02-18  Marek Habersack  <[email protected]>
 
 	* FormView.cs: the ItemCreated must be fired before data is bound

+ 15 - 8
mcs/class/System.Web/System.Web.UI.WebControls/Login.cs

@@ -57,9 +57,17 @@ namespace System.Web.UI.WebControls {
 			{
 				_owner = owner;
 				InitTable ();
-				ID = _owner.ID;
 			}
-
+			
+			public override string ID {
+				get {
+					return _owner.ID;
+				}
+				set {
+					_owner.ID = value;
+				}
+			}
+			
 			public override string ClientID {
 				get {
 					return _owner.ClientID;
@@ -73,9 +81,6 @@ namespace System.Web.UI.WebControls {
 
 			private void InitTable ()
 			{
-				CellSpacing = 0;
-				CellPadding = _owner.BorderPadding;
-
 				_containerCell = new TableCell ();
 
 				TableRow row = new TableRow ();
@@ -83,10 +88,12 @@ namespace System.Web.UI.WebControls {
 				Rows.Add (row);
 			}
 
-			protected internal override void OnPreRender (EventArgs e)
-			{
+			protected internal override void Render (HtmlTextWriter writer) {
+				CellSpacing = 0;
+				CellPadding = _owner.BorderPadding;
 				ApplyStyle (_owner.ControlStyle);
-				base.OnPreRender (e);
+				Attributes.CopyFrom (_owner.Attributes);
+				base.Render (writer);
 			}
 			
 			public Control UserNameTextBox {