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

Update mediatag

Browse Source
This commit is contained in:
yflory
2017-05-04 17:14:24 +02:00
parent 4335b050af
commit 1b6fae4dd2
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/media-tag.js
View File

File diff suppressed because one or more lines are too long

3
www/media/main.js
View File

@@ -65,10 +65,11 @@ define([
var $mt = $iframe.find('#encryptedFile'); var $mt = $iframe.find('#encryptedFile');
$mt.attr('src', '/blob/' + hexFileName.slice(0,2) + '/' + hexFileName); $mt.attr('src', '/blob/' + hexFileName.slice(0,2) + '/' + hexFileName);
$mt.attr('data-crypto-key', cryptKey); $mt.attr('data-crypto-key', 'salsa20poly1305:'+cryptKey);
$mt.attr('data-type', type); $mt.attr('data-type', type);
require(['/common/media-tag.js'], function (MediaTag) { require(['/common/media-tag.js'], function (MediaTag) {
console.log(MediaTag);
var configTb = { var configTb = {
displayed: ['useradmin', 'share', 'newpad'], displayed: ['useradmin', 'share', 'newpad'],
ifrw: ifrw, ifrw: ifrw,