web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Small fixes and improvements

Browse Source
This commit is contained in:
ClemDee
2019-08-13 18:05:03 +02:00
parent f55c8c6b04
commit 4f84a928a9
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,12 +9,11 @@ define([
'/common/outer/local-store.js',
'/common/outer/worker-channel.js',
'/common/outer/login-block.js',
'/file/file-crypto.js',
'/customize/application_config.js',
'/bower_components/nthen/index.js',
], function (Config, Messages, Util, Hash,
Messaging, Constants, Feedback, LocalStore, Channel, Block, FileCrypto,
Messaging, Constants, Feedback, LocalStore, Channel, Block,
AppConfig, Nthen) {
/* This file exposes functionality which is specific to Cryptpad, but not to
@@ -588,9 +587,11 @@ define([
u8 = _u8;
}));
}).nThen(function (waitFor) {
FileCrypto.decrypt(u8, key, waitFor(function (err, _res) {
if (err || !_res.content) { return void waitFor.abort(); }
res = _res;
require(["/file/file-crypto.js"], waitFor(function (FileCrypto) {
FileCrypto.decrypt(u8, key, waitFor(function (err, _res) {
if (err || !_res.content) { return void waitFor.abort(); }
res = _res;
}));
}));
}).nThen(function (waitFor) {
var ext = Util.parseFilename(data.title).ext;