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:
yflory 2017-05-12 18:06:37 +02:00
commit 50d9f72b3a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/common/common-util.js
View File

@ -101,11 +101,11 @@ define([], function () {
xhr.open("GET", src, true); xhr.open("GET", src, true);
xhr.responseType = "arraybuffer"; xhr.responseType = "arraybuffer";
xhr.onload = function () { xhr.onload = function () {
if ([200, 304].indexOf(this.status) === -1) {
return CB('XHR_ERROR');
}
return void CB(void 0, new Uint8Array(xhr.response)); return void CB(void 0, new Uint8Array(xhr.response));
}; };
xhr.onerror = function () {
CB('XHR_ERROR');
};
xhr.send(null); xhr.send(null);
}; };

14
www/media/main.js
View File

@ -20,11 +20,6 @@ define([
Cryptpad.addLoadingScreen(); Cryptpad.addLoadingScreen();
var andThen = function () { var andThen = function () {
$(window.document).on('decryption', function (e) {
var decrypted = e.originalEvent;
console.log(decrypted.blob, decrypted.metadata);
});
var $bar = $iframe.find('.toolbar-container'); var $bar = $iframe.find('.toolbar-container');
var secret = Cryptpad.getSecrets(); var secret = Cryptpad.getSecrets();
@ -71,11 +66,16 @@ define([
$mt.attr('data-crypto-key', 'cryptpad:'+cryptKey); $mt.attr('data-crypto-key', 'cryptpad:'+cryptKey);
$mt.attr('data-type', type); $mt.attr('data-type', type);
window.onMediaMetadata = function (metadata) { $(window.document).on('decryption', function (e) {
var decrypted = e.originalEvent;
var metadata = decrypted.metadata;
console.log(metadata);
console.log(defaultName);
if (!metadata || metadata.name !== defaultName) { return; } if (!metadata || metadata.name !== defaultName) { return; }
var title = document.title = metadata.name; var title = document.title = metadata.name;
updateTitle(title || defaultName); updateTitle(title || defaultName);
}; });
require(['/common/media-tag.js'], function (MediaTag) { require(['/common/media-tag.js'], function (MediaTag) {
var configTb = { var configTb = {