Merge branch 'serviceworker' into staging

2018-06-12 18:24:19 +02:00
parent ff25929c18 1b49020753
commit 4896fe81fe
14 changed files with 2474 additions and 1477 deletions
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -704,6 +704,9 @@ define([
                    readOnly: readOnly,
                    crypto: Crypto.createEncryptor(secret.keys),
                    onConnect: function () {
+                        var href = parsed.getUrl();
+                        // Add friends requests handlers when we have the final href
+                        Cryptpad.messaging.addHandlers(href);
                        if (window.location.hash && window.location.hash !== '#') {
                            window.location = parsed.getUrl({
                                present: parsed.hashData.present,