diff options
author | Erik Johnston <erik@matrix.org> | 2016-10-13 14:23:48 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-10-14 10:22:43 +0100 |
commit | 6f7540ada44b26d6eced6788650a08df672d0610 (patch) | |
tree | 37fbc9d465a630ec2ac244d8860b35bbfcbd697d /synapse/rest/client/v2_alpha/auth.py | |
parent | Fix email push notifs being dropped (diff) | |
parent | Merge pull request #1168 from matrix-org/rav/ui_auth_on_device_delete (diff) | |
download | synapse-6f7540ada44b26d6eced6788650a08df672d0610.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_email_notifs
Diffstat (limited to 'synapse/rest/client/v2_alpha/auth.py')
-rw-r--r-- | synapse/rest/client/v2_alpha/auth.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/auth.py b/synapse/rest/client/v2_alpha/auth.py index 58d3cad6a1..8e5577148f 100644 --- a/synapse/rest/client/v2_alpha/auth.py +++ b/synapse/rest/client/v2_alpha/auth.py @@ -77,8 +77,10 @@ SUCCESS_TEMPLATE = """ user-scalable=no, minimum-scale=1.0, maximum-scale=1.0'> <link rel="stylesheet" href="/_matrix/static/client/register/style.css"> <script> -if (window.onAuthDone != undefined) { +if (window.onAuthDone) { window.onAuthDone(); +} else if (window.opener && window.opener.postMessage) { + window.opener.postMessage("authDone", "*"); } </script> </head> |