Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions

View File

@ -59,11 +59,7 @@ namespace System.Web.UI.WebControls
string t = Target;
string s = NavigateUrl;
if (s.Length > 0)
#if TARGET_J2EE
w.AddAttribute (HtmlTextWriterAttribute.Href, ResolveClientUrl (s, String.Compare (t, "_blank", StringComparison.InvariantCultureIgnoreCase) != 0));
#else
w.AddAttribute (HtmlTextWriterAttribute.Href, ResolveClientUrl (s));
#endif
if (t.Length > 0)
w.AddAttribute (HtmlTextWriterAttribute.Target, t);
}
@ -108,13 +104,7 @@ namespace System.Web.UI.WebControls
w.AddAttribute (HtmlTextWriterAttribute.Src, ResolveClientUrl (image_url));
str = Text;
#if !NET_4_0
if (!String.IsNullOrEmpty (str))
#endif
w.AddAttribute (HtmlTextWriterAttribute.Alt, str);
#if !NET_4_0
w.AddStyleAttribute (HtmlTextWriterStyle.BorderWidth, "0px");
#endif
w.RenderBeginTag (HtmlTextWriterTag.Img);
w.RenderEndTag ();
} else
@ -166,10 +156,8 @@ namespace System.Web.UI.WebControls
Controls.Clear ();
}
}
#if NET_4_0
public override bool SupportsDisabledAttribute {
get { return RenderingCompatibilityLessThan40; }
}
#endif
}
}