Commit 7ff92788 authored by alexey.musinov's avatar alexey.musinov

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

parents 16e82f20 4b26e39b
......@@ -164,6 +164,7 @@
"../word/apiCommon.js",
"../common/clipboard_base.js",
"../common/text_input.js",
"../common/Drawings/Format/OleObject.js",
"../common/plugins.js"
],
......
......@@ -198,12 +198,7 @@
//use binary strings
if(copyPasteUseBinary)
{
if(isIntoShape)
{
this.lStorage = {};
this.lStorage.htmlInShape = text;
}
else
if(!isIntoShape)
{
sBase64 = this.getBinaryForCopy(worksheet);
$(container.children[0]).addClass(sBase64);
......@@ -216,6 +211,14 @@
getBinaryForCopy: function(worksheet)
{
var objectRender = worksheet.objectRender;
var isIntoShape = objectRender.controller.getTargetDocContent();
if(isIntoShape)
{
return null;
}
pptx_content_writer.Start_UseFullUrl();
//TODO стоит убрать заглушку при правке бага с activeRange
......
......@@ -767,7 +767,7 @@
break;
}
if (_data_format != "")
if (_data_format != "" && _data !== null)
{
if (_data_format == "text/x-custom")
this.ClosureParams.setData(_data_format, "asc_internalData;" + _data);
......
......@@ -155,6 +155,7 @@
if (true)
{
this.api.asc_fireCallback("asc_onPluginClose");
var _div = document.getElementById("plugin_iframe");
if (_div)
_div.parentNode.removeChild(_div);
......@@ -166,7 +167,6 @@
this.run(this.runAndCloseData.guid, this.runAndCloseData.variation, this.runAndCloseData.data);
this.runAndCloseData = null;
}
this.api.asc_fireCallback("asc_onPluginClose");
},
show : function()
......
......@@ -59,14 +59,14 @@ function CFootnotesController(LogicDocument)
X : 0,
Y : 0,
PageAbs : 0,
MouseEvent : global_mouseEvent
MouseEvent : AscCommon.global_mouseEvent
},
End : {
Footnote : null,
X : 0,
Y : 0,
PageAbs : 0,
MouseEvent : global_mouseEvent
MouseEvent : AscCommon.global_mouseEvent
},
Footnotes : {},
Direction : 0
......
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