Commit 7bc8c7e6 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

http://bugzserver/show_bug.cgi?id=30541 - [Copy&Paste] При вставке нескольких...

http://bugzserver/show_bug.cgi?id=30541 - [Copy&Paste] При вставке нескольких изображений, одно вставляется "красным крестом", после копирования из DE

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@65199 954022d7-b5bf-4e40-9824-e11837661b57
parent 9423c0ed
......@@ -8365,6 +8365,8 @@
{
//показываем плашку для отправки изображений на сервер
api.handlers.trigger("asc_onStartAction", c_oAscAsyncActionType.BlockInteraction, c_oAscAsyncAction.LoadImage);
var oObjectsForDownload = GetObjectsForImageDownload(val._aPastedImages);
var rData = {"id": api.documentId, "c":"imgurls", "vkey": api.documentVKey, "userid": api.documentUserId, "saveindex": g_oDocumentUrls.getMaxIndex(), "data": val._images};
api.fCurCallback = function(input) {
......@@ -8381,9 +8383,18 @@
urls[elem.path] = elem.url;
var name = g_oDocumentUrls.imagePath2Local(elem.path);
aImagesSync.push(name);
var imageElem = val._aPastedImages[i];
if(null != imageElem) {
imageElem.SetUrl(name);
var imageElem = oObjectsForDownload && oObjectsForDownload.aBuilderImagesByUrl && oObjectsForDownload.aBuilderImagesByUrl[i] ? oObjectsForDownload.aBuilderImagesByUrl[i] : null;
if(null != imageElem) {
if(imageElem.length)
{
for(var j = 0; j < imageElem.length; j++)
{
if(imageElem[j])
imageElem[j].SetUrl(name);
}
}
else
imageElem.SetUrl(name);
}
}
}
......
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