Commit 5e3b8b45 authored by Oleg Korshul's avatar Oleg Korshul

correct paste html

parent d1b1d2fb
...@@ -1228,16 +1228,26 @@ ...@@ -1228,16 +1228,26 @@
return null; return null;
var _elem = document.createElement("div"); var _elem = document.createElement("div");
_elem.innerHTML = htmlText; _elem.innerHTML = htmlText;
document.body.appendChild(_elem); document.body.appendChild(_elem);
this.incrementCounterLongAction(); this.incrementCounterLongAction();
this.asc_PasteData(AscCommon.c_oAscClipboardDataFormat.HtmlElement, _elem); this.asc_PasteData(AscCommon.c_oAscClipboardDataFormat.HtmlElement, _elem);
this.decrementCounterLongAction(); this.decrementCounterLongAction();
this.checkLongActionCallback(function(){ if (true)
{
this.checkLongActionCallback(function ()
{
document.body.removeChild(_elem); document.body.removeChild(_elem);
_elem = null; _elem = null;
}, null); }, null);
}
else
{
document.body.removeChild(_elem);
_elem = null;
}
}; };
// Builder // Builder
......
...@@ -4603,9 +4603,9 @@ background-repeat: no-repeat;\ ...@@ -4603,9 +4603,9 @@ background-repeat: no-repeat;\
{ {
this.isPasteFonts_Images = false; this.isPasteFonts_Images = false;
this.pasteImageMap = null; this.pasteImageMap = null;
this.decrementCounterLongAction();
this.pasteCallback(); this.pasteCallback();
this.pasteCallback = null; this.pasteCallback = null;
this.decrementCounterLongAction();
} }
else if (this.isSaveFonts_Images) else if (this.isSaveFonts_Images)
{ {
......
...@@ -5986,9 +5986,9 @@ background-repeat: no-repeat;\ ...@@ -5986,9 +5986,9 @@ background-repeat: no-repeat;\
{ {
this.isPasteFonts_Images = false; this.isPasteFonts_Images = false;
this.pasteImageMap = null; this.pasteImageMap = null;
this.decrementCounterLongAction();
this.pasteCallback(); this.pasteCallback();
this.pasteCallback = null; this.pasteCallback = null;
this.decrementCounterLongAction();
} }
else if (this.isSaveFonts_Images) else if (this.isSaveFonts_Images)
{ {
......
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