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

Clean images in onlyoffice

This commit is contained in:
yflory 2020-01-22 15:47:12 +01:00
parent ad94e97444
commit 6fd079bfb0
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -678,7 +678,7 @@ define([
var m = metadataMgr.getChannelMembers().slice().filter(function (nId) { var m = metadataMgr.getChannelMembers().slice().filter(function (nId) {
return nId.length === 32; return nId.length === 32;
}); });
if (m.length === 1 && !APP.loadingImage) { if (m.length === 1 && APP.loadingImage <= 0) {
try { try {
var docs = window.frames[0].AscCommon.g_oDocumentUrls.urls || {}; var docs = window.frames[0].AscCommon.g_oDocumentUrls.urls || {};
var mediasSources = getMediasSources(); var mediasSources = getMediasSources();
@ -867,19 +867,21 @@ define([
return void callback(""); return void callback("");
} }
var blobUrl = URL.createObjectURL(res.content); try {
// store media blobUrl and content for cache and export var blobUrl = URL.createObjectURL(res.content);
var mediaData = { blobUrl : blobUrl, content : "" }; // store media blobUrl and content for cache and export
mediasData[data.src] = mediaData; var mediaData = { blobUrl : blobUrl, content : "" };
var reader = new FileReader(); mediasData[data.src] = mediaData;
reader.onloadend = function () { var reader = new FileReader();
debug("MediaData set"); reader.onloadend = function () {
mediaData.content = reader.result; debug("MediaData set");
}; mediaData.content = reader.result;
reader.readAsArrayBuffer(res.content); };
debug("Adding CryptPad Image " + data.name + ": " + blobUrl); reader.readAsArrayBuffer(res.content);
window.frames[0].AscCommon.g_oDocumentUrls.addImageUrl(data.name, blobUrl); debug("Adding CryptPad Image " + data.name + ": " + blobUrl);
callback(blobUrl); window.frames[0].AscCommon.g_oDocumentUrls.addImageUrl(data.name, blobUrl);
callback(blobUrl);
} catch (e) {}
}); });
} catch (e) { } catch (e) {
APP.loadingImage--; APP.loadingImage--;