summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorunknown <andarno@.redmond.corp.microsoft.com>2010-06-21 22:36:20 -0700
committerunknown <andarno@.redmond.corp.microsoft.com>2010-06-21 22:36:20 -0700
commit5844923f77789d2f58dd65e34e138753629a5d13 (patch)
treeb07157838eda1e313567f609f43668759dc7b805 /src
parente4b6a46c82db607d43ee352dd5ab0ae65848e5ba (diff)
downloadDotNetOpenAuth-5844923f77789d2f58dd65e34e138753629a5d13.zip
DotNetOpenAuth-5844923f77789d2f58dd65e34e138753629a5d13.tar.gz
DotNetOpenAuth-5844923f77789d2f58dd65e34e138753629a5d13.tar.bz2
When the parent window throws an error in an invocation from the child window, it no longer prevents the child window from closing itself.
Diffstat (limited to 'src')
-rw-r--r--src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingParty.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingParty.cs b/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingParty.cs
index a416f3a..a5fdf9b 100644
--- a/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingParty.cs
+++ b/src/DotNetOpenAuth/OpenId/RelyingParty/OpenIdRelyingParty.cs
@@ -800,8 +800,13 @@ namespace DotNetOpenAuth.OpenId.RelyingParty {
// so we have to actually put the test for it ABOVE the call to objSrc.{0} so that it already
// whether to call window.self.close() after the call.
string htmlFormat = @" if (inPopup) {{
- objSrc.{0};
- window.self.close();
+ try {{
+ objSrc.{0};
+ }} catch (ex) {{
+ alert(ex);
+ }} finally {{
+ window.self.close();
+ }}
}} else {{
objSrc.{0};
}}";