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

@ -120,11 +120,7 @@ namespace System.Web.UI.WebControls
Page page = Page;
options.ActionUrl = (PostBackUrl.Length > 0 ?
#if TARGET_J2EE
CreateActionUrl (PostBackUrl)
#else
page != null ? page.ResolveClientUrl (PostBackUrl) : PostBackUrl
#endif
: null);
options.ValidationGroup = null;
options.Argument = String.Empty;
@ -264,11 +260,9 @@ namespace System.Web.UI.WebControls
get { return ViewState.GetString ("ValidationGroup", String.Empty); }
set { ViewState ["ValidationGroup"] = value; }
}
#if NET_4_0
public override bool SupportsDisabledAttribute {
get { return RenderingCompatibilityLessThan40; }
}
#endif
}
}