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

Fixes in onlyoffice code for image upload realtime and ooslide

Browse Source
This commit is contained in:
Ludovic Dubost
2020-01-04 02:02:20 +01:00
parent 1c19e6f2b5
commit 4cfa391a17
6 changed files with 75 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
www/common/onlyoffice/sdkjs/slide/sdk-all.js
View File

@@ -205879,6 +205879,11 @@ function DecodeBase64(imData, szSrc)
this.LoadDocumentImages = function(_images, isUrl)
{
// CryptPad added logging
console.log("Loading images");
console.log(_images);
// CryptPad end logging
// сначала заполним массив
if (this.ThemeLoader == null)
this.Api.asyncImagesDocumentStartLoaded();
@@ -206042,16 +206047,18 @@ function DecodeBase64(imData, szSrc)
oThat.Api.asyncImageEndLoadedBackground(oImage);
};
//oImage.Image.crossOrigin = 'anonymous';
console.log("Loading image " + i);
console.log(oImage);
// CRYPTPAD: if we find an image URL with #channel= in it
// then we need to ask cryptpad to get the blob
if (oImage.src.indexOf("#src=")!=-1)
window.parent.APP.getImageURL(oImage.src, function(url) {
if (oImage.src.indexOf("#src=")!=-1) {
window.parent.APP.getImageURL(oImage.src, function(url) {
oThis.loadImageByUrl(oImage.Image, url);
oThis.map_image_index[url] = oImage;
});
else
oThis.loadImageByUrl(oImage.Image, oImage.src);
});
} else {
oThis.loadImageByUrl(oImage.Image, oImage.src);
}
};
this.LoadImagesWithCallback = function(arr, loadImageCallBack, loadImageCallBackArgs)