Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions

View File

@@ -1213,9 +1213,18 @@ namespace System.Web.UI.WebControls {
if (imageToolTip.Length > 0) {
writer.AddAttribute(HtmlTextWriterAttribute.Alt,
String.Format(CultureInfo.CurrentCulture, imageToolTip, Text));
//fix bug 1197460, quirk it so the fix will only be enabled on projects on 4.6.1 or later version of framework
if (BinaryCompatibility.Current.TargetsAtLeastFramework461) {
writer.AddAttribute(HtmlTextWriterAttribute.Title,
String.Format(CultureInfo.CurrentCulture, imageToolTip, Text));
}
}
else {
writer.AddAttribute(HtmlTextWriterAttribute.Alt, String.Empty);
//fix bug 1197460, quirk it so the fix will only be enabled on projects on 4.6.1 or later version of framework
if (BinaryCompatibility.Current.TargetsAtLeastFramework461) {
writer.AddAttribute(HtmlTextWriterAttribute.Title, String.Empty);
}
}
writer.RenderBeginTag(HtmlTextWriterTag.Img);
writer.RenderEndTag();
@@ -1362,9 +1371,17 @@ namespace System.Web.UI.WebControls {
writer.AddStyleAttribute(HtmlTextWriterStyle.BorderWidth, "0");
if (ImageToolTip.Length > 0) {
writer.AddAttribute(HtmlTextWriterAttribute.Alt, ImageToolTip);
//fix bug 1197460, quirk it so the fix will only be enabled on projects on 4.6.1 or later version of framework
if (BinaryCompatibility.Current.TargetsAtLeastFramework461) {
writer.AddAttribute(HtmlTextWriterAttribute.Title, ImageToolTip);
}
}
else {
writer.AddAttribute(HtmlTextWriterAttribute.Alt, String.Empty);
//fix bug 1197460, quirk it so the fix will only be enabled on projects on 4.6.1 or later version of framework
if (BinaryCompatibility.Current.TargetsAtLeastFramework461) {
writer.AddAttribute(HtmlTextWriterAttribute.Title, String.Empty);
}
}
writer.RenderBeginTag(HtmlTextWriterTag.Img);
writer.RenderEndTag();