diff --git a/cell/api.js b/cell/api.js index 30ded55860..8c086fe26b 100644 --- a/cell/api.js +++ b/cell/api.js @@ -3479,7 +3479,7 @@ var editor; } } if(aImages.length > 0) { - window["Asc"]["editor"].ImageLoader.LoadDocumentImages(aImages, null); + window["Asc"]["editor"].ImageLoader.LoadDocumentImages(aImages); } callback(); }); diff --git a/cell/model/DrawingObjects/GlobalCounters.js b/cell/model/DrawingObjects/GlobalCounters.js index 3d46467c50..29d9552ab9 100644 --- a/cell/model/DrawingObjects/GlobalCounters.js +++ b/cell/model/DrawingObjects/GlobalCounters.js @@ -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 = {}; } diff --git a/cell/model/clipboard.js b/cell/model/clipboard.js index 83d872c244..811b7c88c4 100644 --- a/cell/model/clipboard.js +++ b/cell/model/clipboard.js @@ -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); diff --git a/common/Charts/DrawingObjects.js b/common/Charts/DrawingObjects.js index 731dc9a699..cec7d1e2e0 100644 --- a/common/Charts/DrawingObjects.js +++ b/common/Charts/DrawingObjects.js @@ -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); } }); diff --git a/common/GlobalLoaders.js b/common/GlobalLoaders.js index f9fbc1dcbd..0f3d08b700 100644 --- a/common/GlobalLoaders.js +++ b/common/GlobalLoaders.js @@ -495,7 +495,7 @@ } }; - this.LoadDocumentImages = function(_images, isUrl) + this.LoadDocumentImages = function(_images) { // сначала заполним массив if (this.ThemeLoader == null) diff --git a/common/Native/Wrappers/api.js b/common/Native/Wrappers/api.js index bbc739ed82..11882d8c4c 100755 --- a/common/Native/Wrappers/api.js +++ b/common/Native/Wrappers/api.js @@ -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(); diff --git a/slide/Native/Wrappers/api.js b/slide/Native/Wrappers/api.js index a1f2f4239f..57e525f975 100644 --- a/slide/Native/Wrappers/api.js +++ b/slide/Native/Wrappers/api.js @@ -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(); diff --git a/slide/api.js b/slide/api.js index c77e841950..cfe006586e 100644 --- a/slide/api.js +++ b/slide/api.js @@ -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() { diff --git a/word/api.js b/word/api.js index 2c9f2e4482..313143dc1e 100644 --- a/word/api.js +++ b/word/api.js @@ -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() {