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/common/common-ui-elements.js
View File

@@ -1544,7 +1544,7 @@ define([
if (secret.keys && secret.channel) {
var hexFileName = secret.channel;
var cryptKey = Hash.encodeBase64(secret.keys && secret.keys.cryptKey);
var src = Hash.getBlobPathFromHex(hexFileName);
var src = origin + Hash.getBlobPathFromHex(hexFileName);
common.getFileSize(hexFileName, function (e, data) {
if (e || !data) {
displayDefault();
@@ -1553,7 +1553,7 @@ define([
if (typeof data !== "number") { return void displayDefault(); }
if (Util.bytesToMegabytes(data) > 0.5) { return void displayDefault(); }
var $img = $('<media-tag>').appendTo($container);
$img.attr('src', origin + src);
$img.attr('src', src);
$img.attr('data-crypto-key', 'cryptpad:' + cryptKey);
UIElements.displayMediatagImage(common, $img, function (err, $image, img) {
if (err) { return void console.error(err); }