diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2011-10-20 06:31:36 -0700 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2011-10-20 06:31:36 -0700 |
| commit | 1bfa2063458dc5d81eb198d13114c4a810ea88ad (patch) | |
| tree | bc1ca01d290a6bb2bf5a66ad55455fc7e5f74886 /src | |
| parent | b8b3c1cf15fdcb612c72b30f21a523b6714fa54e (diff) | |
| parent | 68780b4d316f47c7d62e17826a1ca4c7198a809b (diff) | |
| download | DotNetOpenAuth-1bfa2063458dc5d81eb198d13114c4a810ea88ad.zip DotNetOpenAuth-1bfa2063458dc5d81eb198d13114c4a810ea88ad.tar.gz DotNetOpenAuth-1bfa2063458dc5d81eb198d13114c4a810ea88ad.tar.bz2 | |
Merge pull request #53 from dotnetjunky/splitDlls
Rename async argument to make it compile with .net async ctp.
Diffstat (limited to 'src')
| -rw-r--r-- | src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs index 54f3a07..e83cf0e 100644 --- a/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs +++ b/src/DotNetOpenAuth.OpenId.RelyingParty.UI/OpenId/RelyingParty/OpenIdRelyingPartyAjaxControlBase.cs @@ -436,7 +436,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty { /// </summary> /// <param name="async">if set to <c>true</c> causes the AJAX callback to be a little more asynchronous. Note that <c>false</c> does not mean the call is absolutely synchronous.</param> /// <returns>The string defining a javascript anonymous function that initiates a callback.</returns> - private string GetJsCallbackConvenienceFunction(bool async) { + private string GetJsCallbackConvenienceFunction(bool @async) { string argumentParameterName = "argument"; string callbackResultParameterName = "resultFunction"; string callbackErrorCallbackParameterName = "errorCallback"; @@ -446,7 +446,7 @@ namespace DotNetOpenAuth.OpenId.RelyingParty { callbackResultParameterName, argumentParameterName, callbackErrorCallbackParameterName, - async); + @async); return string.Format( CultureInfo.InvariantCulture, "function({1}, {2}, {3}) {{{0}\treturn {4};{0}}};", |