infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

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

pull/1/head
yflory 2017-12-21 17:38:28 +01:00
parent 0e6e68aaff 892dfb18f7
commit a26031c119
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/common/common-thumbnail.js
View File

@ -254,6 +254,12 @@ define([
var cryptKey = secret.keys && secret.keys.fileKeyStr;
var key = Nacl.util.decodeBase64(cryptKey);
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;
if (!v) {
v = 'EMPTY';

3
www/common/cryptpad-common.js
View File

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