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/code/inner.js
View File

@@ -272,6 +272,7 @@ define([
var andThen2 = function (editor, CodeMirror, framework, isPresentMode) {
var common = framework._.sfCommon;
var privateData = common.getMetadataMgr().getPrivateData();
var previewPane = mkPreviewPane(editor, CodeMirror, framework, isPresentMode);
var markdownTb = mkMarkdownTb(editor, framework);
@@ -349,7 +350,8 @@ define([
onUploaded: function (ev, data) {
var parsed = Hash.parsePadUrl(data.url);
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);
var mt = '<media-tag src="' + src + '" data-crypto-key="cryptpad:' + key + '"></media-tag>';
editor.replaceSelection(mt);