merge staging into pending allow-list work

2020-02-21 13:52:10 -05:00
parent 7ee8778210 668ea95de2
commit cac114bb52
11 changed files with 211 additions and 71 deletions
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -801,6 +801,20 @@ define([
                Cryptpad.saveAsTemplate(Cryptget.put, data, cb);
            });

+            sframeChan.on('EV_MAKE_A_COPY', function () {
+                var data = {
+                    channel: secret.channel,
+                    href: currentPad.href,
+                    password: password,
+                    title: currentTitle
+                };
+                sessionStorage[Utils.Constants.newPadFileData] = JSON.stringify(data);
+                window.open(window.location.pathname);
+                setTimeout(function () {
+                    delete sessionStorage[Utils.Constants.newPadFileData];
+                }, 100);
+            });
+
            // Messaging
            sframeChan.on('Q_SEND_FRIEND_REQUEST', function (data, cb) {
                Cryptpad.messaging.sendFriendRequest(data, cb);