Merge branch 'communities-oo' into staging

www/common/common-ui-elements.js

@@ -932,7 +932,6 @@ define([
                             waitFor.abort();
                             return;
                         }
-                        console.warn('BAR');
                         href = url;
                         setTimeout(w);
                     });
@@ -1077,12 +1076,17 @@ define([
     var makeBurnAfterReadingUrl = function (common, href, channel, cb) {
         var keyPair = Hash.generateSignPair();
         var parsed = Hash.parsePadUrl(href);
-        console.error(href, parsed);
         var newHref = parsed.getUrl({
             ownerKey: keyPair.safeSignKey
         });
         var sframeChan = common.getSframeChannel();
+        var rtChannel;
         NThen(function (waitFor) {
+            if (parsed.type !== "sheet") { return; }
+            common.getPadAttribute('rtChannel', waitFor(function (err, chan) {
+                rtChannel = chan;
+            }));
+        }).nThen(function (waitFor) {
             sframeChan.query('Q_SET_PAD_METADATA', {
                 channel: channel,
                 command: 'ADD_OWNERS',
@@ -1093,6 +1097,17 @@ define([
                     UI.warn(Messages.error);
                 }
             }));
+            if (rtChannel) {
+                sframeChan.query('Q_SET_PAD_METADATA', {
+                    channel: rtChannel,
+                    command: 'ADD_OWNERS',
+                    value: [keyPair.validateKey]
+                }, waitFor(function (err) {
+                    if (err) {
+                        console.error(err);
+                    }
+                }));
+            }
         }).nThen(function () {
             cb(newHref);
         });

www/common/onlyoffice/inner.js

@@ -1140,6 +1140,9 @@ define([
             if (ext === "bin") {
                 return void importFile(content);
             }
+            if (typeof(Atomics) === "undefined") {
+                return void UI.alert(Messages.oo_invalidFormat);
+            }
             var div = h('div.cp-oo-x2tXls', [
                 h('span.fa.fa-spin.fa-spinner'),
                 h('span', Messages.oo_importInProgress)
@@ -1340,7 +1343,11 @@ define([
             var $exportXLSX = common.createButton('export', true, {}, exportXLSXFile);
             $exportXLSX.appendTo($rightside);
 
-            var $importXLSX = common.createButton('import', true, { accept: [".bin", ".ods", ".xlsx"], binary : ["ods", "xlsx"] }, importXLSXFile);
+            var accept = [".bin", ".ods", ".xlsx"];
+            if (typeof(Atomics) === "undefined") {
+                accept = ['.bin'];
+            }
+            var $importXLSX = common.createButton('import', true, { accept: accept, binary : ["ods", "xlsx"] }, importXLSXFile);
             $importXLSX.appendTo($rightside);
 
             if (common.isLoggedIn()) {
@@ -1395,6 +1402,10 @@ define([
                 Title.updateTitle(Title.defaultTitle);
             }
 
+            if (metadataMgr.getPrivateData().burnAfterReading && content && content.channel) {
+                sframeChan.event('EV_BURN_PAD', content.channel);
+            }
+
             openRtChannel(function () {
                 setMyId();
                 oldHashes = JSON.parse(JSON.stringify(content.hashes));

www/common/onlyoffice/main.js

@@ -64,8 +64,8 @@ define([
                 var owners, expire;
                 nThen(function (waitFor) {
                     if (Utils.rtConfig) {
-                        owners = Utils.rtConfig.owners;
-                        expire = Utils.rtConfig.expire;
+                        owners = Utils.Util.find(Utils.rtConfig, ['metadata', 'owners']);
+                        expire = Utils.Util.find(Utils.rtConfig, ['metadata', 'expire']);
                         return;
                     }
                     Cryptpad.getPadAttribute('owners', waitFor(function (err, res) {

www/common/sframe-common-outer.js

@@ -520,6 +520,33 @@ define([
                 sframeChan.on('Q_SET_PAD_METADATA', function (data, cb) {
                     Cryptpad.setPadMetadata(data, cb);
                 });
+
+                sframeChan.on('Q_GET_PAD_ATTRIBUTE', function (data, cb) {
+                    var href;
+                    if (readOnly && hashes.editHash) {
+                        // If we have a stronger hash, use it for pad attributes
+                        href = window.location.pathname + '#' + hashes.editHash;
+                    }
+                    if (data.href) { href = data.href; }
+                    Cryptpad.getPadAttribute(data.key, function (e, data) {
+                        cb({
+                            error: e,
+                            data: data
+                        });
+                    }, href);
+                });
+                sframeChan.on('Q_SET_PAD_ATTRIBUTE', function (data, cb) {
+                    var href;
+                    if (readOnly && hashes.editHash) {
+                        // If we have a stronger hash, use it for pad attributes
+                        href = window.location.pathname + '#' + hashes.editHash;
+                    }
+                    if (data.href) { href = data.href; }
+                    Cryptpad.setPadAttribute(data.key, data.value, function (e) {
+                        cb({error:e});
+                    }, href);
+                });
+
             };
             addCommonRpc(sframeChan);
 
@@ -749,32 +776,6 @@ define([
             });
 
             // Store
-            sframeChan.on('Q_GET_PAD_ATTRIBUTE', function (data, cb) {
-                var href;
-                if (readOnly && hashes.editHash) {
-                    // If we have a stronger hash, use it for pad attributes
-                    href = window.location.pathname + '#' + hashes.editHash;
-                }
-                if (data.href) { href = data.href; }
-                Cryptpad.getPadAttribute(data.key, function (e, data) {
-                    cb({
-                        error: e,
-                        data: data
-                    });
-                }, href);
-            });
-            sframeChan.on('Q_SET_PAD_ATTRIBUTE', function (data, cb) {
-                var href;
-                if (readOnly && hashes.editHash) {
-                    // If we have a stronger hash, use it for pad attributes
-                    href = window.location.pathname + '#' + hashes.editHash;
-                }
-                if (data.href) { href = data.href; }
-                Cryptpad.setPadAttribute(data.key, data.value, function (e) {
-                    cb({error:e});
-                }, href);
-            });
-
             sframeChan.on('Q_DRIVE_GETDELETED', function (data, cb) {
                 Cryptpad.getDeletedPads(data, function (err, obj) {
                     if (err) { return void console.error(err); }
@@ -1183,6 +1184,14 @@ define([
                 });
             });
 
+            sframeChan.on('EV_BURN_PAD', function (channel) {
+                if (!burnAfterReading) { return; }
+                Cryptpad.burnPad({
+                    channel: channel,
+                    ownerKey: burnAfterReading
+                });
+            });
+
             if (cfg.messaging) {
                 Notifier.getPermission();
 

www/common/sframe-common.js

@@ -354,7 +354,7 @@ define([
             key: key,
             href: href
         }, function (err, res) {
-            cb (err || res.error, res.data);
+            cb(err || res.error, res && res.data);
         });
     };
     funcs.setPadAttribute = function (key, value, cb, href) {