Commit 186126f3 authored by Oleg Korshul's avatar Oleg Korshul Committed by GitHub

Merge pull request #67 from ONLYOFFICE/hotfix/v4.1.2

Hotfix/v4.1.2
parents c256953c 211bdd79
...@@ -3064,6 +3064,10 @@ function CEditorPage(api) ...@@ -3064,6 +3064,10 @@ function CEditorPage(api)
this.onTimerScroll = function(isThUpdateSync) this.onTimerScroll = function(isThUpdateSync)
{ {
var oWordControl = oThis; var oWordControl = oThis;
if (oWordControl.m_oApi.isLongAction())
return;
oWordControl.m_nTimeDrawingLast = new Date().getTime(); oWordControl.m_nTimeDrawingLast = new Date().getTime();
var isRepaint = oWordControl.m_bIsScroll; var isRepaint = oWordControl.m_bIsScroll;
......
...@@ -3765,6 +3765,9 @@ function CEditorPage(api) ...@@ -3765,6 +3765,9 @@ function CEditorPage(api)
if (!oWordControl.m_oApi.bInit_word_control) if (!oWordControl.m_oApi.bInit_word_control)
return; return;
if (oWordControl.m_oApi.isLongAction())
return;
oWordControl.m_nTimeDrawingLast = new Date().getTime(); oWordControl.m_nTimeDrawingLast = new Date().getTime();
var isRepaint = oWordControl.m_bIsScroll; var isRepaint = oWordControl.m_bIsScroll;
if (oWordControl.m_bIsScroll) if (oWordControl.m_bIsScroll)
......
...@@ -1304,9 +1304,9 @@ ...@@ -1304,9 +1304,9 @@
this.Document.Selection_Remove(true); this.Document.Selection_Remove(true);
} }
var oParagraph = this.Document.Content[this.Document.CurPos.ContentPos]; var oParagraph = this.Document.Get_CurrentParagraph();
if (!oParagraph || !(oParagraph instanceof Paragraph)) if (!oParagraph)
return false; return;
var oNearestPos = { var oNearestPos = {
Paragraph : oParagraph, Paragraph : oParagraph,
...@@ -1318,9 +1318,9 @@ ...@@ -1318,9 +1318,9 @@
if (!this.Document.Can_InsertContent(oSelectedContent, oNearestPos)) if (!this.Document.Can_InsertContent(oSelectedContent, oNearestPos))
return false; return false;
this.Document.Insert_Content(oSelectedContent, oNearestPos); oParagraph.Parent.Insert_Content(oSelectedContent, oNearestPos);
this.Document.Selection_Remove(true);
oParagraph.Clear_NearestPosArray(); oParagraph.Clear_NearestPosArray();
this.Document.Selection_Remove(true);
return true; return 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