Commit 93bb3794 authored by GoshaZotov's avatar GoshaZotov

do not load fonts/images if special paste options -> paste only values (from...

do not load fonts/images if special paste options -> paste only values (from word / html / cell editor)
parent 01b4eafb
...@@ -2216,16 +2216,16 @@ PasteProcessor.prototype = ...@@ -2216,16 +2216,16 @@ PasteProcessor.prototype =
//table into table //table into table
//this.pasteTypeContent и this.pasteList нужны для вставки таблиц/списков и тд //this.pasteTypeContent и this.pasteList нужны для вставки таблиц/списков и тд
//TODO пока вставка будет работать только с текстом(форматированный/не форматированный) //TODO пока вставка будет работать только с текстом(форматированный/не форматированный)
if(insertToElem && 1 === aContent.length && type_Table === this.aContent[0].GetType() && type_Table === insertToElem.GetType()) /*if(insertToElem && 1 === aContent.length && type_Table === this.aContent[0].GetType() && type_Table === insertToElem.GetType())
{ {
//props = [sProps.paste, sProps.insertAsNestedTable, sProps.uniteIntoTable, sProps.insertAsNewRows, sProps.pasteOnlyValues]; props = [sProps.paste, sProps.insertAsNestedTable, sProps.uniteIntoTable, sProps.insertAsNewRows, sProps.pasteOnlyValues];
} }
else if(this.pasteList && insertToElem && type_Paragraph === insertToElem.GetType() && insertToElem.Pr && insertToElem.Pr.NumPr && insertToElem.Pr.NumPr.Is_Equal(this.pasteList)) else if(this.pasteList && insertToElem && type_Paragraph === insertToElem.GetType() && insertToElem.Pr && insertToElem.Pr.NumPr && insertToElem.Pr.NumPr.Is_Equal(this.pasteList))
{ {
//вставка нумерованного списка в нумерованный список //вставка нумерованного списка в нумерованный список
//props = [sProps.paste, sProps.uniteList, sProps.doNotUniteList]; props = [sProps.paste, sProps.uniteList, sProps.doNotUniteList];
} }*/
else if(true)
{ {
props = [sProps.paste/*, sProps.mergeFormatting*/, sProps.pasteOnlyValues]; props = [sProps.paste/*, sProps.mergeFormatting*/, sProps.pasteOnlyValues];
} }
...@@ -2863,8 +2863,13 @@ PasteProcessor.prototype = ...@@ -2863,8 +2863,13 @@ PasteProcessor.prototype =
var aContentExcel = this._readFromBinaryExcel(base64FromExcel); var aContentExcel = this._readFromBinaryExcel(base64FromExcel);
History.TurnOn(); History.TurnOn();
if(window['AscCommon'].g_clipboardBase.specialPasteStart && Asc.c_oSpecialPasteProps.pasteOnlyValues === window['AscCommon'].g_clipboardBase.specialPasteProps)
if(aContentExcel.arrImages && aContentExcel.arrImages.length) {
var aContent = oThis._convertExcelBinary(aContentExcel);
oThis.aContent = aContent.content;
fPrepasteCallback();
}
else if(aContentExcel.arrImages && aContentExcel.arrImages.length)
{ {
var oObjectsForDownload = GetObjectsForImageDownload(aContentExcel.arrImages); var oObjectsForDownload = GetObjectsForImageDownload(aContentExcel.arrImages);
AscCommon.sendImgUrls(oThis.api, oObjectsForDownload.aUrls, function (data) { AscCommon.sendImgUrls(oThis.api, oObjectsForDownload.aUrls, function (data) {
...@@ -3067,7 +3072,11 @@ PasteProcessor.prototype = ...@@ -3067,7 +3072,11 @@ PasteProcessor.prototype =
aContent.fonts = oThis._checkFontsOnLoad(aContent.fonts); aContent.fonts = oThis._checkFontsOnLoad(aContent.fonts);
var oObjectsForDownload = GetObjectsForImageDownload(aContent.aPastedImages); var oObjectsForDownload = GetObjectsForImageDownload(aContent.aPastedImages);
if(oObjectsForDownload.aUrls.length > 0) if(window['AscCommon'].g_clipboardBase.specialPasteStart && Asc.c_oSpecialPasteProps.pasteOnlyValues === window['AscCommon'].g_clipboardBase.specialPasteProps)
{
fPrepasteCallback();
}
else if(oObjectsForDownload.aUrls.length > 0)
{ {
if(bIsOnlyFromBinary && window["NativeCorrectImageUrlOnPaste"]) if(bIsOnlyFromBinary && window["NativeCorrectImageUrlOnPaste"])
{ {
...@@ -3990,10 +3999,19 @@ PasteProcessor.prototype = ...@@ -3990,10 +3999,19 @@ PasteProcessor.prototype =
}; };
this.oRootNode = node; this.oRootNode = node;
if(PasteElementsId.g_bIsDocumentCopyPaste) if(PasteElementsId.g_bIsDocumentCopyPaste)
{ {
this.bIsPlainText = this._CheckIsPlainText(node); this.bIsPlainText = this._CheckIsPlainText(node);
this._Prepeare(node, fPasteHtmlWordCallback);
if(window['AscCommon'].g_clipboardBase.specialPasteStart && Asc.c_oSpecialPasteProps.pasteOnlyValues === window['AscCommon'].g_clipboardBase.specialPasteProps)
{
fPasteHtmlWordCallback();
}
else
{
this._Prepeare(node, fPasteHtmlWordCallback);
}
if(bTurnOffTrackRevisions){ if(bTurnOffTrackRevisions){
oThis.api.WordControl.m_oLogicDocument.TrackRevisions = true; oThis.api.WordControl.m_oLogicDocument.TrackRevisions = 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