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

Fix fileHost again...

Browse Source
This commit is contained in:
yflory
2019-08-27 15:31:22 +02:00
parent 7afea886e7
commit 7bd4a4028b
11 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/filepicker/inner.js
View File

@@ -29,6 +29,7 @@ define([
var andThen = function (common) {
var metadataMgr = common.getMetadataMgr();
var privateData = metadataMgr.getPrivateData();
var $body = $('body');
var sframeChan = common.getSframeChannel();
var filters = metadataMgr.getPrivateData().types;
@@ -41,7 +42,8 @@ define([
hideFileDialog();
if (parsed.type === 'file') {
var secret = Hash.getSecrets('file', parsed.hash, data.password);
var src = Hash.getBlobPathFromHex(secret.channel);
var fileHost = privateData.fileHost || privateData.origin;
var src = fileHost + Hash.getBlobPathFromHex(secret.channel);
var key = Hash.encodeBase64(secret.keys.cryptKey);
sframeChan.event("EV_FILE_PICKED", {
type: parsed.type,