Commit 357eeb49 authored by alexey.musinov's avatar alexey.musinov

Merge branch 'develop' of https://github.com/ONLYOFFICE/sdkjs into develop

parents 3177eab3 07ccb6b8
......@@ -9412,17 +9412,34 @@
}
else
{
AscCommon.sendImgUrls( api, oObjectsForDownload.aUrls, function ( data ) {
var oImageMap = {};
AscCommon.ResetNewUrls( data, oObjectsForDownload.aUrls, oObjectsForDownload.aBuilderImagesByUrl, oImageMap );
if(window["NATIVE_EDITOR_ENJINE"])
{
var oImageMap = {};
AscCommon.ResetNewUrls( data, oObjectsForDownload.aUrls, oObjectsForDownload.aBuilderImagesByUrl, oImageMap );
if ( pasteContent.props.onlyImages !== true ) {
t._pasteData( isLargeRange, isLocal, pasteContent, bIsUpdate, canChangeColWidth );
}
api.wb.clipboard.pasteProcessor._insertImagesFromBinaryWord( t, pasteContent, oImageMap );
//закрываем транзакцию, поскольку в setSelectionInfo она не закроется
History.EndTransaction();
}, true );
if ( pasteContent.props.onlyImages !== true )
{
t._pasteData( isLargeRange, isLocal, pasteContent, bIsUpdate, canChangeColWidth );
}
api.wb.clipboard.pasteProcessor._insertImagesFromBinaryWord( t, pasteContent, oImageMap );
isEndTransaction = true;
}
else
{
AscCommon.sendImgUrls( api, oObjectsForDownload.aUrls, function ( data ) {
var oImageMap = {};
AscCommon.ResetNewUrls( data, oObjectsForDownload.aUrls, oObjectsForDownload.aBuilderImagesByUrl, oImageMap );
if ( pasteContent.props.onlyImages !== true ) {
t._pasteData( isLargeRange, isLocal, pasteContent, bIsUpdate, canChangeColWidth );
}
api.wb.clipboard.pasteProcessor._insertImagesFromBinaryWord( t, pasteContent, oImageMap );
//закрываем транзакцию, поскольку в setSelectionInfo она не закроется
History.EndTransaction();
}, true );
}
}
}
else if ( pasteContent.props.onlyImages !== true )
......
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