mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.2.0.175

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

34
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs
View File

@ -216,7 +216,7 @@ namespace System.Web.UI.HtmlControls
base.OnPreRender(e);
}
protected override void RenderAttributes (HtmlTextWriter w)
protected override void RenderAttributes (HtmlTextWriter writer)
{
/* Need to always render: method, action and id
*/
@ -268,12 +268,12 @@ namespace System.Web.UI.HtmlControls
if (RenderingCompatibilityLessThan40)
// LAMESPEC: MSDN says the 'name' attribute is rendered only in
// Legacy mode, this is not true.
w.WriteAttribute ("name", Name);
writer.WriteAttribute ("name", Name);
}
w.WriteAttribute ("method", Method);
writer.WriteAttribute ("method", Method);
if (String.IsNullOrEmpty (customAction))
w.WriteAttribute ("action", action, true);
writer.WriteAttribute ("action", action, true);
/*
* This is a hack that guarantees the ID is set properly for HtmlControl to
@ -292,7 +292,7 @@ namespace System.Web.UI.HtmlControls
string submit = page != null ? page.GetSubmitStatements () : null;
if (!String.IsNullOrEmpty (submit)) {
Attributes.Remove ("onsubmit");
w.WriteAttribute ("onsubmit", submit);
writer.WriteAttribute ("onsubmit", submit);
}
/* enctype and target should not be written if
@ -300,11 +300,11 @@ namespace System.Web.UI.HtmlControls
*/
string enctype = Enctype;
if (!String.IsNullOrEmpty (enctype))
w.WriteAttribute ("enctype", enctype);
writer.WriteAttribute ("enctype", enctype);
string target = Target;
if (!String.IsNullOrEmpty (target))
w.WriteAttribute ("target", target);
writer.WriteAttribute ("target", target);
string defaultbutton = DefaultButton;
if (!String.IsNullOrEmpty (defaultbutton)) {
@ -315,7 +315,7 @@ namespace System.Web.UI.HtmlControls
ID));
if (page != null && DetermineRenderUplevel ()) {
w.WriteAttribute (
writer.WriteAttribute (
"onkeypress",
"javascript:return " + page.WebFormScriptReference + ".WebForm_FireDefaultButton(event, '" + c.ClientID + "')");
}
@ -328,10 +328,10 @@ namespace System.Web.UI.HtmlControls
Attributes.Remove ("enctype");
Attributes.Remove ("target");
base.RenderAttributes (w);
base.RenderAttributes (writer);
}
protected internal override void RenderChildren (HtmlTextWriter w)
protected internal override void RenderChildren (HtmlTextWriter writer)
{
Page page = Page;
@ -340,22 +340,22 @@ namespace System.Web.UI.HtmlControls
page.RegisterForm (this);
}
if (page != null)
page.OnFormRender (w, ClientID);
base.RenderChildren (w);
page.OnFormRender (writer, ClientID);
base.RenderChildren (writer);
if (page != null)
page.OnFormPostRender (w, ClientID);
page.OnFormPostRender (writer, ClientID);
}
/* According to corcompare */
[MonoTODO ("why override?")]
public override void RenderControl (HtmlTextWriter w)
public override void RenderControl (HtmlTextWriter writer)
{
base.RenderControl (w);
base.RenderControl (writer);
}
protected internal override void Render (HtmlTextWriter w)
protected internal override void Render (HtmlTextWriter output)
{
base.Render (w);
base.Render (output);
}
}
}

8
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlImage.cs
View File

@ -185,9 +185,9 @@ namespace System.Web.UI.HtmlControls
}
}
protected override void RenderAttributes (HtmlTextWriter w)
protected override void RenderAttributes (HtmlTextWriter writer)
{
PreProcessRelativeReference (w, "src");
PreProcessRelativeReference (writer, "src");
/* MS does not seem to render the src attribute if it
* is empty. Firefox, at least, will fetch the current
@ -197,13 +197,13 @@ namespace System.Web.UI.HtmlControls
if (src == null || src.Length == 0)
Attributes.Remove ("src");
base.RenderAttributes (w);
base.RenderAttributes (writer);
/* MS closes the HTML element at the end of
* the attributes too, according to the nunit
* tests
*/
w.Write (" /");
writer.Write (" /");
}
}
}

32
mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs
View File

@ -585,7 +585,7 @@ namespace System.Web.UI.HtmlControls
}
}
protected override void RenderAttributes (HtmlTextWriter w)
protected override void RenderAttributes (HtmlTextWriter writer)
{
Page page = Page;
if (page != null)
@ -594,7 +594,7 @@ namespace System.Web.UI.HtmlControls
/* If there is no "name" attribute,
* LoadPostData doesn't work...
*/
w.WriteAttribute ("name", Name);
writer.WriteAttribute ("name", Name);
Attributes.Remove ("name");
/* Don't render the databinding attributes */
@ -602,24 +602,24 @@ namespace System.Web.UI.HtmlControls
Attributes.Remove ("datatextfield");
Attributes.Remove ("datavaluefield");
base.RenderAttributes (w);
base.RenderAttributes (writer);
}
protected internal override void RenderChildren (HtmlTextWriter w)
protected internal override void RenderChildren (HtmlTextWriter writer)
{
base.RenderChildren (w);
base.RenderChildren (writer);
if (items == null)
return;
w.WriteLine ();
writer.WriteLine ();
bool done_sel = false;
int count = items.Count;
for (int i = 0; i < count; i++) {
ListItem item = items[i];
w.Indent++;
writer.Indent++;
/* Write the <option> elements this
* way so that the output HTML matches
@ -628,29 +628,29 @@ namespace System.Web.UI.HtmlControls
* element, cos that breaks other
* stuff.)
*/
w.WriteBeginTag ("option");
writer.WriteBeginTag ("option");
if (item.Selected && !done_sel) {
w.WriteAttribute ("selected", "selected");
writer.WriteAttribute ("selected", "selected");
if (!Multiple) {
done_sel = true;
}
}
w.WriteAttribute ("value", item.Value, true);
writer.WriteAttribute ("value", item.Value, true);
if (item.HasAttributes) {
AttributeCollection attrs = item.Attributes;
foreach (string key in attrs.Keys)
w.WriteAttribute (key, HttpUtility.HtmlAttributeEncode (attrs [key]));
writer.WriteAttribute (key, HttpUtility.HtmlAttributeEncode (attrs [key]));
}
w.Write (HtmlTextWriter.TagRightChar);
writer.Write (HtmlTextWriter.TagRightChar);
w.Write (HttpUtility.HtmlEncode(item.Text));
w.WriteEndTag ("option");
w.WriteLine ();
writer.Write (HttpUtility.HtmlEncode(item.Text));
writer.WriteEndTag ("option");
writer.WriteLine ();
w.Indent--;
writer.Indent--;
}
}