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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
ansuz 2017-05-04 18:25:23 +02:00
commit c3d1554e8c
2 changed files with 8 additions and 5 deletions
Show Stats 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

11
www/media/main.js
View File

@ -29,8 +29,6 @@ define([
var fileId = secret.channel; var fileId = secret.channel;
var hexFileName = Cryptpad.base64ToHex(fileId); var hexFileName = Cryptpad.base64ToHex(fileId);
var type = "image/png"; var type = "image/png";
// Test hash:
// #/2/K6xWU-LT9BJHCQcDCT-DcQ/TBo77200c0e-FdldQFcnQx4Y/
var parsed = Cryptpad.parsePadUrl(window.location.href); var parsed = Cryptpad.parsePadUrl(window.location.href);
var defaultName = Cryptpad.getDefaultName(parsed); var defaultName = Cryptpad.getDefaultName(parsed);
@ -65,9 +63,15 @@ 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', 'cryptpad:'+cryptKey);
$mt.attr('data-type', type); $mt.attr('data-type', type);
window.onMediaMetadata = function (metadata) {
if (title !== defaultTitle) { return; }
var title = document.title = metadata.name;
updateTitle(title || defaultName);
};
require(['/common/media-tag.js'], function (MediaTag) { require(['/common/media-tag.js'], function (MediaTag) {
var configTb = { var configTb = {
displayed: ['useradmin', 'share', 'newpad'], displayed: ['useradmin', 'share', 'newpad'],
@ -84,7 +88,6 @@ define([
} }
}; };
Toolbar.create($bar, null, null, null, null, configTb); Toolbar.create($bar, null, null, null, null, configTb);
//var $rightside = $bar.find('.' + Toolbar.constants.rightside);
updateTitle(Cryptpad.initialName || getTitle() || defaultName); updateTitle(Cryptpad.initialName || getTitle() || defaultName);