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

pull/1/head
yflory 7 years ago
commit a26031c119

@ -254,6 +254,12 @@ define([
var cryptKey = secret.keys && secret.keys.fileKeyStr; var cryptKey = secret.keys && secret.keys.fileKeyStr;
var key = Nacl.util.decodeBase64(cryptKey); var key = Nacl.util.decodeBase64(cryptKey);
FileCrypto.fetchDecryptedMetadata(src, key, function (e, metadata) { FileCrypto.fetchDecryptedMetadata(src, key, function (e, metadata) {
if (e) {
if (e === 'XHR_ERROR') { return; }
return console.error(e);
}
if (!metadata) { return console.error("NO_METADATA"); }
var v = metadata.thumbnail; var v = metadata.thumbnail;
if (!v) { if (!v) {
v = 'EMPTY'; v = 'EMPTY';

@ -703,6 +703,9 @@ define([
if (typeof(Worker) === "undefined") { if (typeof(Worker) === "undefined") {
Feedback.send('NO_WEBWORKER'); Feedback.send('NO_WEBWORKER');
} }
if (typeof(ServiceWorker) === "undefined") {
Feedback.send('NO_SERVICEWORKER');
}
Feedback.reportScreenDimensions(); Feedback.reportScreenDimensions();
Feedback.reportLanguage(); Feedback.reportLanguage();

Loading…
Cancel
Save