Commit b7b27c5b authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

// на методе OpenDocumentEndCallback может поменяться this.EndActionLoadImages

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@63107 954022d7-b5bf-4e40-9824-e11837661b57
parent 7bac10b6
...@@ -3809,8 +3809,22 @@ asc_docs_api.prototype.asyncImagesDocumentStartLoaded = function() ...@@ -3809,8 +3809,22 @@ asc_docs_api.prototype.asyncImagesDocumentStartLoaded = function()
asc_docs_api.prototype.asyncImagesDocumentEndLoaded = function() asc_docs_api.prototype.asyncImagesDocumentEndLoaded = function()
{ {
this.ImageLoader.bIsLoadDocumentFirst = false; this.ImageLoader.bIsLoadDocumentFirst = false;
var _bIsOldPaste = this.isPasteFonts_Images; var _bIsOldPaste = this.isPasteFonts_Images;
if (this.EndActionLoadImages == 1)
{
this.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadDocumentImages);
}
else if (this.EndActionLoadImages == 2)
{
if (_bIsOldPaste)
this.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
else
this.sync_EndAction(c_oAscAsyncActionType.Information, c_oAscAsyncAction.LoadImage);
}
this.EndActionLoadImages = 0;
// размораживаем меню... и начинаем считать документ // размораживаем меню... и начинаем считать документ
if (this.isPasteFonts_Images) if (this.isPasteFonts_Images)
{ {
...@@ -3836,20 +3850,6 @@ asc_docs_api.prototype.asyncImagesDocumentEndLoaded = function() ...@@ -3836,20 +3850,6 @@ asc_docs_api.prototype.asyncImagesDocumentEndLoaded = function()
this.asyncServerIdStartLoaded(); this.asyncServerIdStartLoaded();
} }
if (this.EndActionLoadImages == 1)
{
this.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadDocumentImages);
}
else if (this.EndActionLoadImages == 2)
{
if (_bIsOldPaste)
this.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
else
this.sync_EndAction(c_oAscAsyncActionType.Information, c_oAscAsyncAction.LoadImage);
}
this.EndActionLoadImages = 0;
}; };
asc_docs_api.prototype.asc_getComments = function() asc_docs_api.prototype.asc_getComments = function()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment