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

@ -154,9 +154,7 @@ namespace System.Web.UI.WebControls
base.Render (writer);
if (spots != null && spots.Count > 0) {
#if NET_4_0
bool enabled = Enabled;
#endif
writer.AddAttribute (HtmlTextWriterAttribute.Id, "ImageMap" + ClientID);
writer.AddAttribute (HtmlTextWriterAttribute.Name, "ImageMap" + ClientID);
writer.RenderBeginTag (HtmlTextWriterTag.Map);
@ -180,18 +178,10 @@ namespace System.Web.UI.WebControls
string target = spot.Target.Length > 0 ? spot.Target : Target;
if (!String.IsNullOrEmpty (target))
writer.AddAttribute (HtmlTextWriterAttribute.Target, target);
#if NET_4_0
if (enabled) {
#endif
#if TARGET_J2EE
string navUrl = ResolveClientUrl (spot.NavigateUrl, String.Compare (target, "_blank", StringComparison.InvariantCultureIgnoreCase) != 0);
#else
string navUrl = ResolveClientUrl (spot.NavigateUrl);
#endif
writer.AddAttribute (HtmlTextWriterAttribute.Href, navUrl);
#if NET_4_0
}
#endif
break;
case HotSpotMode.PostBack:
writer.AddAttribute (HtmlTextWriterAttribute.Href, Page.ClientScript.GetPostBackClientHyperlink (this, n.ToString(), true));