Commit cc17d391 authored by Sergey Luzyanin's avatar Sergey Luzyanin

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

parents c91cf59a 3a0c5259
...@@ -128,6 +128,7 @@ ...@@ -128,6 +128,7 @@
pasteData: function(ws, _format, data1, data2) pasteData: function(ws, _format, data1, data2)
{ {
var t = this; var t = this;
t.pasteProcessor.clean();
switch (_format) switch (_format)
{ {
...@@ -742,6 +743,15 @@ ...@@ -742,6 +743,15 @@
constructor: PasteProcessorExcel, constructor: PasteProcessorExcel,
clean: function()
{
this.activeRange = null;
this.alreadyLoadImagesOnServer = false;
this.fontsNew = {};
this.oImages = {};
},
pasteFromBinary: function(worksheet, binary, isCellEditMode) pasteFromBinary: function(worksheet, binary, isCellEditMode)
{ {
var base64 = null, base64FromWord = null, base64FromPresentation = null, t = this; var base64 = null, base64FromWord = null, base64FromPresentation = null, t = this;
......
...@@ -2467,6 +2467,10 @@ PasteProcessor.prototype = ...@@ -2467,6 +2467,10 @@ PasteProcessor.prototype =
} }
} }
if(onlyBinary)
{
return;
}
//***вставляем извне в редактор документов*** //***вставляем извне в редактор документов***
var presentation = editor.WordControl.m_oLogicDocument; var presentation = editor.WordControl.m_oLogicDocument;
...@@ -3257,7 +3261,12 @@ PasteProcessor.prototype = ...@@ -3257,7 +3261,12 @@ PasteProcessor.prototype =
} }
} }
} }
if(onlyBinary)
{
return;
}
this.oRootNode = node; this.oRootNode = node;
this._Prepeare(node, this._Prepeare(node,
function(){ 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