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

http://bugzserver/show_bug.cgi?id=25783 - [Copy&Paste] Ошибка в консоль при...

http://bugzserver/show_bug.cgi?id=25783 - [Copy&Paste] Ошибка в консоль при копировании текста из ячейки в автофигуру через контекстное меню

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57538 954022d7-b5bf-4e40-9824-e11837661b57
parent 44753a1f
...@@ -464,7 +464,14 @@ ...@@ -464,7 +464,14 @@
this.lStorage = sBase64; this.lStorage = sBase64;
window.global_pptx_content_writer.End_UseFullUrl() window.global_pptx_content_writer.End_UseFullUrl()
} };
this._cleanElement();
if(text !== false)
this.element.appendChild(text);
if(this.element.children[0] && sBase64)
$(this.element.children[0]).addClass("xslData;" + sBase64);
return true; return true;
} }
else if(activateLocalStorage) else if(activateLocalStorage)
...@@ -633,7 +640,15 @@ ...@@ -633,7 +640,15 @@
else if(activateLocalStorage || copyPasteUseBinary) else if(activateLocalStorage || copyPasteUseBinary)
{ {
var t = this; var t = this;
t._addValueToLocalStrg(value) t._addValueToLocalStrg(value);
var nodes = t._makeNodesFromCellValue(value);
t._cleanElement();
nodes.forEach(
function(node){
t.element.appendChild(node);
});
return true; return true;
} }
return false; return false;
...@@ -1668,7 +1683,7 @@ ...@@ -1668,7 +1683,7 @@
var newFonts; var newFonts;
if(onlyFromLocalStorage) if(onlyFromLocalStorage)
node = this.lStorage.htmlInShape ? this.lStorage.htmlInShape : this.lStorage; node = this.element;//this.lStorage.htmlInShape ? this.lStorage.htmlInShape : this.lStorage;
//если находимся внутри диаграммы убираем ссылки //если находимся внутри диаграммы убираем ссылки
if(targetDocContent && targetDocContent.Parent && targetDocContent.Parent.parent && targetDocContent.Parent.parent.chart) if(targetDocContent && targetDocContent.Parent && targetDocContent.Parent.parent && targetDocContent.Parent.parent.chart)
...@@ -1753,6 +1768,14 @@ ...@@ -1753,6 +1768,14 @@
if(isOnlyLocalBufferSafari && navigator.userAgent.toLowerCase().indexOf('safari') > -1 && navigator.userAgent.toLowerCase().indexOf('mac')) if(isOnlyLocalBufferSafari && navigator.userAgent.toLowerCase().indexOf('safari') > -1 && navigator.userAgent.toLowerCase().indexOf('mac'))
onlyFromLocalStorage = true; onlyFromLocalStorage = true;
//****binary****
if(onlyFromLocalStorage)
{
onlyFromLocalStorage = null;
node = this.element;
pasteFragment = node;
};
//если находимся внутри шейпа //если находимся внутри шейпа
var isIntoShape = worksheet.objectRender.controller.getTargetDocContent(); var isIntoShape = worksheet.objectRender.controller.getTargetDocContent();
if(isIntoShape) if(isIntoShape)
......
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