Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

7 years ago · 288c03bb41
parent 430a6f7b77 fe03e6ae83
commit 288c03bb41
2 changed files with 3 additions and 1 deletions
--- a/www/pad/links.js
+++ b/www/pad/links.js
@ -29,7 +29,8 @@ define(['/common/cryptpad-common.js'], function (Cryptpad) {
                        if (anchor) {
                            var href = anchor.getAttribute('href');
                            if (href) {
-                                window.open(href);
+                                var bounceHref = window.location.origin + '/bounce/#' + encodeURIComponent(href);
+                                window.open(bounceHref);
                            }
                        }
                    }
--- a/www/pad/main.js
+++ b/www/pad/main.js
@ -176,6 +176,7 @@ define([

        sframeChan.on('Q_SEND_FRIEND_REQUEST', function (netfluxId, cb) {
            Cryptpad.inviteFromUserlist(Cryptpad, netfluxId);
+            cb();
        });
        Cryptpad.onFriendRequest = function (confirmText, cb) {
            sframeChan.query('Q_INCOMING_FRIEND_REQUEST', confirmText, function (err, data) {