[all] Refactoring

Delete unused argument 'isUrl' in function LoadDocumentImages
This commit is contained in:
Alexander.Trofimov
2019-04-03 19:10:26 +03:00
parent 13820fc3ee
commit 9cb182130b
9 changed files with 16 additions and 16 deletions

View File

@ -3479,7 +3479,7 @@ var editor;
}
}
if(aImages.length > 0) {
window["Asc"]["editor"].ImageLoader.LoadDocumentImages(aImages, null);
window["Asc"]["editor"].ImageLoader.LoadDocumentImages(aImages);
}
callback();
});

View File

@ -147,7 +147,7 @@ CCollaborativeEditing.prototype.SendImagesCallback = function (aImages)
{
bOldVal = oApi.ImageLoader.bIsAsyncLoadDocumentImages;
oApi.ImageLoader.bIsAsyncLoadDocumentImages = true;
oApi.ImageLoader.LoadDocumentImages(aImages, null);
oApi.ImageLoader.LoadDocumentImages(aImages);
oApi.ImageLoader.bIsAsyncLoadDocumentImages = bOldVal;
this.WaitImages = {};
}

View File

@ -1870,7 +1870,7 @@
}
AscFormat.fResetConnectorsIds(aCopies, oIdMap);
if (aImagesSync.length > 0) {
window["Asc"]["editor"].ImageLoader.LoadDocumentImages(aImagesSync, null);
window["Asc"]["editor"].ImageLoader.LoadDocumentImages(aImagesSync);
}
ws.objectRender.controller.updateSelectionState();
ws.objectRender.showDrawingObjects(true);
@ -2010,7 +2010,7 @@
var old_val = api.ImageLoader.bIsAsyncLoadDocumentImages;
api.ImageLoader.bIsAsyncLoadDocumentImages = true;
api.ImageLoader.LoadDocumentImages(aImagesSync, null);
api.ImageLoader.LoadDocumentImages(aImagesSync);
api.ImageLoader.bIsAsyncLoadDocumentImages = old_val;
ws.objectRender.showDrawingObjects(true);

View File

@ -1815,7 +1815,7 @@ function DrawingObjects() {
{
var old_val = api.ImageLoader.bIsAsyncLoadDocumentImages;
api.ImageLoader.bIsAsyncLoadDocumentImages = true;
api.ImageLoader.LoadDocumentImages(aImagesSync, null);
api.ImageLoader.LoadDocumentImages(aImagesSync);
api.ImageLoader.bIsAsyncLoadDocumentImages = old_val;
}
@ -2849,7 +2849,7 @@ function DrawingObjects() {
History.TurnOn();
if(aImagesSync.length > 0)
{
window["Asc"]["editor"].ImageLoader.LoadDocumentImages(aImagesSync, null);
window["Asc"]["editor"].ImageLoader.LoadDocumentImages(aImagesSync);
}
});

View File

@ -495,7 +495,7 @@
}
};
this.LoadDocumentImages = function(_images, isUrl)
this.LoadDocumentImages = function(_images)
{
// сначала заполним массив
if (this.ThemeLoader == null)

View File

@ -6222,7 +6222,7 @@ Asc['asc_docs_api'].prototype.openDocument = function(sData)
//console.log("ImageMap : " + JSON.stringify(this.WordControl.m_oLogicDocument));
this.ImageLoader.bIsLoadDocumentFirst = true;
this.ImageLoader.LoadDocumentImages(this.WordControl.m_oLogicDocument.ImageMap, true);
this.ImageLoader.LoadDocumentImages(this.WordControl.m_oLogicDocument.ImageMap);
this.WordControl.m_oLogicDocument.Continue_FastCollaborativeEditing();

View File

@ -3412,7 +3412,7 @@ Asc['asc_docs_api'].prototype.openDocument = function(sData)
//console.log("ImageMap : " + JSON.stringify(this.WordControl.m_oLogicDocument));
this.ImageLoader.bIsLoadDocumentFirst = true;
this.ImageLoader.LoadDocumentImages(this.WordControl.m_oLogicDocument.ImageMap, true);
this.ImageLoader.LoadDocumentImages(this.WordControl.m_oLogicDocument.ImageMap);
this.WordControl.m_oLogicDocument.Continue_FastCollaborativeEditing();

View File

@ -4899,7 +4899,7 @@ background-repeat: no-repeat;\
this.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
}
this.ImageLoader.LoadDocumentImages(this.pasteImageMap, false);
this.ImageLoader.LoadDocumentImages(this.pasteImageMap);
return;
}
else if (this.isSaveFonts_Images)
@ -4914,7 +4914,7 @@ background-repeat: no-repeat;\
this.sync_StartAction(c_oAscAsyncActionType.Information, c_oAscAsyncAction.LoadImage);
}
this.ImageLoader.LoadDocumentImages(this.saveImageMap, false);
this.ImageLoader.LoadDocumentImages(this.saveImageMap);
return;
}
@ -4941,7 +4941,7 @@ background-repeat: no-repeat;\
}
this.ImageLoader.bIsLoadDocumentFirst = true;
this.ImageLoader.LoadDocumentImages(_loader_object.ImageMap, true);
this.ImageLoader.LoadDocumentImages(_loader_object.ImageMap);
};
asc_docs_api.prototype.asyncImagesDocumentEndLoaded = function()
{

View File

@ -6250,7 +6250,7 @@ background-repeat: no-repeat;\
var _oldAsyncLoadImages = this.ImageLoader.bIsAsyncLoadDocumentImages;
this.ImageLoader.bIsAsyncLoadDocumentImages = false;
this.ImageLoader.LoadDocumentImages(this.pasteImageMap, false);
this.ImageLoader.LoadDocumentImages(this.pasteImageMap);
this.ImageLoader.bIsAsyncLoadDocumentImages = true;
return;
}
@ -6266,7 +6266,7 @@ background-repeat: no-repeat;\
this.sync_StartAction(c_oAscAsyncActionType.Information, c_oAscAsyncAction.LoadImage);
}
this.ImageLoader.LoadDocumentImages(this.saveImageMap, false);
this.ImageLoader.LoadDocumentImages(this.saveImageMap);
return;
}
@ -6309,7 +6309,7 @@ background-repeat: no-repeat;\
}
this.ImageLoader.bIsLoadDocumentFirst = true;
this.ImageLoader.LoadDocumentImages(_loader_object.ImageMap, true);
this.ImageLoader.LoadDocumentImages(_loader_object.ImageMap);
};
asc_docs_api.prototype.CreateFontsCharMap = function()
@ -6741,7 +6741,7 @@ background-repeat: no-repeat;\
this.sync_StartAction(c_oAscAsyncActionType.Information, c_oAscAsyncAction.LoadImage);
}
this.ImageLoader.LoadDocumentImages(this.loadCustomImageMap, false);
this.ImageLoader.LoadDocumentImages(this.loadCustomImageMap);
};
asc_docs_api.prototype.SyncLoadImages_callback = function()
{