Skip to content

S
sdkjs
Commit 3a55e2bc authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov
Browse files
Options

Bug 29992 - Ошибка в консоле после копирования и вставки группы изображений на новый слайд и undo 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64176 954022d7-b5bf-4e40-9824-e11837661b57
parent cd7df70e
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 1 deletion
Common/wordcopypaste.js
View file @ 3a55e2bc
...@@ -2880,6 +2880,7 @@ PasteProcessor.prototype = ...@@ -2880,6 +2880,7 @@ PasteProcessor.prototype =
} }
var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)}; var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)};
oThis.api.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
sendCommand2(function(incomeObject){ sendCommand2(function(incomeObject){
if(incomeObject && "imgurls" == incomeObject.type) if(incomeObject && "imgurls" == incomeObject.type)
{ {
...@@ -2917,6 +2918,7 @@ PasteProcessor.prototype = ...@@ -2917,6 +2918,7 @@ PasteProcessor.prototype =
var aContent = oThis._convertExcelBinary(aContentExcel); var aContent = oThis._convertExcelBinary(aContentExcel);
oThis.aContent = aContent.content; oThis.aContent = aContent.content;
oThis.api.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
oThis.api.pre_Paste(aContent.fonts, image_map, fPrepasteCallback); oThis.api.pre_Paste(aContent.fonts, image_map, fPrepasteCallback);
}, _sendCommandCallback, rData); }, _sendCommandCallback, rData);
...@@ -2986,6 +2988,7 @@ PasteProcessor.prototype = ...@@ -2986,6 +2988,7 @@ PasteProcessor.prototype =
else else
{ {
var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)}; var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)};
oThis.api.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
sendCommand2(function(incomeObject){ sendCommand2(function(incomeObject){
if(incomeObject && "imgurls" == incomeObject.type) if(incomeObject && "imgurls" == incomeObject.type)
{ {
...@@ -3008,6 +3011,7 @@ PasteProcessor.prototype = ...@@ -3008,6 +3011,7 @@ PasteProcessor.prototype =
} }
} }
} }
oThis.api.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
oThis.api.pre_Paste(aContent.fonts, aContent.images, fPrepasteCallback); oThis.api.pre_Paste(aContent.fonts, aContent.images, fPrepasteCallback);
}, _sendCommandCallback, rData); }, _sendCommandCallback, rData);
} }
...@@ -3102,7 +3106,9 @@ PasteProcessor.prototype = ...@@ -3102,7 +3106,9 @@ PasteProcessor.prototype =
} }
var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)}; var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)};
oThis.api.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
sendCommand2(function(incomeObject){ sendCommand2(function(incomeObject){
if(incomeObject && "imgurls" == incomeObject.type) if(incomeObject && "imgurls" == incomeObject.type)
{ {
var oFromTo = JSON.parse(incomeObject.data); var oFromTo = JSON.parse(incomeObject.data);
...@@ -3155,6 +3161,7 @@ PasteProcessor.prototype = ...@@ -3155,6 +3161,7 @@ PasteProcessor.prototype =
aContent = oThis._convertExcelBinary(null, arr_shapes); aContent = oThis._convertExcelBinary(null, arr_shapes);
oThis.aContent = aContent.content; oThis.aContent = aContent.content;
oThis.api.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
oThis.api.pre_Paste(aContent.fonts, image_map, fPrepasteCallback); oThis.api.pre_Paste(aContent.fonts, image_map, fPrepasteCallback);
}, _sendCommandCallback, rData); }, _sendCommandCallback, rData);
...@@ -3362,6 +3369,7 @@ PasteProcessor.prototype = ...@@ -3362,6 +3369,7 @@ PasteProcessor.prototype =
if(aImagesToDownload.length > 0) if(aImagesToDownload.length > 0)
{ {
var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)}; var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)};
oThis.api.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
sendCommand2(function(incomeObject){ sendCommand2(function(incomeObject){
if(incomeObject && "imgurls" == incomeObject.type) if(incomeObject && "imgurls" == incomeObject.type)
{ {
...@@ -3394,6 +3402,7 @@ PasteProcessor.prototype = ...@@ -3394,6 +3402,7 @@ PasteProcessor.prototype =
} }
} }
} }
oThis.api.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
oThis.api.pre_Paste(fonts, image_map, paste_callback); oThis.api.pre_Paste(fonts, image_map, paste_callback);
}, _sendCommandCallback, rData); }, _sendCommandCallback, rData);
} }
...@@ -3666,6 +3675,7 @@ PasteProcessor.prototype = ...@@ -3666,6 +3675,7 @@ PasteProcessor.prototype =
if(aImagesToDownload.length > 0) if(aImagesToDownload.length > 0)
{ {
var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)}; var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)};
oThis.api.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
sendCommand2(function(incomeObject){ sendCommand2(function(incomeObject){
if(incomeObject && "imgurls" == incomeObject.type) if(incomeObject && "imgurls" == incomeObject.type)
{ {
...@@ -3695,6 +3705,8 @@ PasteProcessor.prototype = ...@@ -3695,6 +3705,8 @@ PasteProcessor.prototype =
} }
} }
} }
oThis.api.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
oThis.api.pre_Paste(fonts, image_map, paste_callback); oThis.api.pre_Paste(fonts, image_map, paste_callback);
}, _sendCommandCallback, rData); }, _sendCommandCallback, rData);
} }
...@@ -3767,6 +3779,7 @@ PasteProcessor.prototype = ...@@ -3767,6 +3779,7 @@ PasteProcessor.prototype =
if(aImagesToDownload.length > 0) if(aImagesToDownload.length > 0)
{ {
var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)}; var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)};
oThis.api.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
sendCommand2(function(incomeObject){ sendCommand2(function(incomeObject){
if(incomeObject && "imgurls" == incomeObject.type) if(incomeObject && "imgurls" == incomeObject.type)
{ {
...@@ -3778,6 +3791,7 @@ PasteProcessor.prototype = ...@@ -3778,6 +3791,7 @@ PasteProcessor.prototype =
if(sTo) if(sTo)
{ oThis.oImages[sFrom] = sTo; oPrepeareImages[i] = sTo; } } { oThis.oImages[sFrom] = sTo; oPrepeareImages[i] = sTo; } }
} }
oThis.api.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
oThis.api.pre_Paste(fonts, oPrepeareImages, paste_callback); oThis.api.pre_Paste(fonts, oPrepeareImages, paste_callback);
}, _sendCommandCallback, rData); }, _sendCommandCallback, rData);
} }
...@@ -3911,6 +3925,7 @@ PasteProcessor.prototype = ...@@ -3911,6 +3925,7 @@ PasteProcessor.prototype =
if(aImagesToDownload.length > 0) if(aImagesToDownload.length > 0)
{ {
var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)}; var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)};
oThis.api.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
sendCommand2(function(incomeObject){ sendCommand2(function(incomeObject){
if(incomeObject && "imgurls" == incomeObject.type) if(incomeObject && "imgurls" == incomeObject.type)
{ {
...@@ -3961,7 +3976,8 @@ PasteProcessor.prototype = ...@@ -3961,7 +3976,8 @@ PasteProcessor.prototype =
checkBlipFillRasterImages(presentationSelectedContent.Drawings[i].Drawing); checkBlipFillRasterImages(presentationSelectedContent.Drawings[i].Drawing);
} }
} }
oThis.api.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
oThis.api.pre_Paste(fonts, image_map, paste_callback); oThis.api.pre_Paste(fonts, image_map, paste_callback);
}, _sendCommandCallback, rData); }, _sendCommandCallback, rData);
} }
...@@ -4046,6 +4062,7 @@ PasteProcessor.prototype = ...@@ -4046,6 +4062,7 @@ PasteProcessor.prototype =
if(images.length > 0) if(images.length > 0)
{ {
var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(images)}; var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(images)};
oThis.api.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
sendCommand2(function(incomeObject){ sendCommand2(function(incomeObject){
if(incomeObject && "imgurls" == incomeObject.type) if(incomeObject && "imgurls" == incomeObject.type)
{ {
...@@ -4078,6 +4095,7 @@ PasteProcessor.prototype = ...@@ -4078,6 +4095,7 @@ PasteProcessor.prototype =
} }
} }
} }
oThis.api.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
oThis.api.pre_Paste(fonts, image_map, paste_callback); oThis.api.pre_Paste(fonts, image_map, paste_callback);
}, _sendCommandCallback, rData); }, _sendCommandCallback, rData);
} }
...@@ -4227,6 +4245,7 @@ PasteProcessor.prototype = ...@@ -4227,6 +4245,7 @@ PasteProcessor.prototype =
if(aImagesToDownload.length > 0) if(aImagesToDownload.length > 0)
{ {
var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)}; var rData = {"id":documentId, "c":"imgurls", "vkey": documentVKey, "data": JSON.stringify(aImagesToDownload)};
oThis.api.sync_StartAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
sendCommand2(function(incomeObject){ sendCommand2(function(incomeObject){
if(incomeObject && "imgurls" == incomeObject.type) if(incomeObject && "imgurls" == incomeObject.type)
{ {
...@@ -4259,6 +4278,7 @@ PasteProcessor.prototype = ...@@ -4259,6 +4278,7 @@ PasteProcessor.prototype =
} }
} }
} }
oThis.api.sync_EndAction(c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
oThis.api.pre_Paste(fonts, image_map, paste_callback); oThis.api.pre_Paste(fonts, image_map, paste_callback);
}, _sendCommandCallback, rData); }, _sendCommandCallback, rData);
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7