dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

handle more response codes, use metadata

This commit is contained in:
ansuz 2017-05-12 17:34:29 +02:00
parent 18d959ef16
commit 30f6ef3f85
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,7 +101,7 @@ 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 (this.status !== 200) { if ([200, 304].indexOf(this.status) === -1) {
return CB('XHR_ERROR'); return CB('XHR_ERROR');
} }
return void CB(void 0, new Uint8Array(xhr.response)); return void CB(void 0, new Uint8Array(xhr.response));

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 = {