Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-06-07 13:16:24 +00:00
parent 4bdbaf4a88
commit 966bba02bb
8776 changed files with 346420 additions and 149650 deletions

View File

@ -49,13 +49,13 @@ namespace System.Web.UI.WebControls
{
}
protected override void AddAttributesToRender (HtmlTextWriter w)
protected override void AddAttributesToRender (HtmlTextWriter writer)
{
Page page = Page;
if (page != null)
page.VerifyRenderingInServerForm (this);
base.AddAttributesToRender (w);
base.AddAttributesToRender (writer);
bool enabled = IsEnabled;
string onclick = OnClientClick;
onclick = ClientScriptManager.EnsureEndsWithSemicolon (onclick);
@ -65,15 +65,15 @@ namespace System.Web.UI.WebControls
}
if (onclick.Length > 0)
w.AddAttribute (HtmlTextWriterAttribute.Onclick, onclick);
writer.AddAttribute (HtmlTextWriterAttribute.Onclick, onclick);
if (enabled && page != null) {
PostBackOptions options = GetPostBackOptions ();
string href = page.ClientScript.GetPostBackEventReference (options, true);
w.AddAttribute (HtmlTextWriterAttribute.Href, href);
writer.AddAttribute (HtmlTextWriterAttribute.Href, href);
}
AddDisplayStyleAttribute (w);
AddDisplayStyleAttribute (writer);
}
protected virtual void RaisePostBackEvent (string eventArgument)