infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix secureiframe in dev instance

pull/1/head
yflory 2021-12-09 11:27:18 +01:00
parent 56114cd646
commit b7f5018ff8
2 changed files with 38 additions and 19 deletions
www/common
onlyoffice
test.js

50
www/common/onlyoffice/inner.js
View File

@ -1511,26 +1511,38 @@ define([
var _mediasSources = getMediasSources();
var images = _obj.data || [];
if (!Array.isArray(images)) { return; }
var urls = images.map(function (name) {
var data = _mediasSources[name];
if (!data) { return; }
var media = mediasData[data.src];
if (!media) { return; }
return {
path: name,
url: media.blobUrl,
};
}).filter(Boolean);
send({
type: "documentOpen",
data: {
type: "imgurls",
status: "ok",
data: {
urls: urls,
error: 0
var urls = [];
nThen(function (waitFor) {
images.forEach(function (name) {
if (/^data\:image/.test(name)) {
Util.fetch(name, waitFor(function (err, u8) {
if (err) { return; }
var b = new Blob([u8]);
urls.push(URL.createObjectURL(b));
}));
return;
}
}
var data = _mediasSources[name];
if (!data) { return; }
var media = mediasData[data.src];
if (!media) { return; }
urls.push({
path: name,
url: media.blobUrl,
});
});
}).nThen(function () {
send({
type: "documentOpen",
data: {
type: "imgurls",
status: "ok",
data: {
urls: urls,
error: 0
}
}
});
});
}
break;

7
www/common/test.js
View File

@ -1,5 +1,12 @@
define([], function () {
if (window.__CRYPTPAD_TEST_OBJ_) { return window.__CRYPTPAD_TEST_OBJ_; }
// XXX localhost secureiframe fix
var out = function () {};
out.options = {};
out.testing = false;
out.registerInner = function () { };
out.registerOuter = function () { };
return out;
var locks = [];
var tests = [];