.

739c3d27 · Oleg Korshul · cb74be9d · 739c3d27 · 739c3d27
Commit 739c3d27 authored Jun 29, 2017 by Oleg Korshul
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

word/Drawing/HtmlPage.js word/Drawing/HtmlPage.js +3 -3

word/api.js word/api.js +2 -0

No files found.
--- a/word/Drawing/HtmlPage.js
+++ b/word/Drawing/HtmlPage.js
@@ -1521,7 +1521,7 @@ function CEditorPage(api)
 		oThis.m_oApi.checkLastWork();

 		//console.log("down: " + isTouch + ", " + AscCommon.isTouch);
-		if (false === oThis.m_oApi.bInit_word_control || (AscCommon.isTouch && undefined === isTouch))
+		if (false === oThis.m_oApi.bInit_word_control || (AscCommon.isTouch && undefined === isTouch) || oThis.m_oApi.isLongAction())
 			return;

 		if (!oThis.m_bIsIE)
@@ -1630,7 +1630,7 @@ function CEditorPage(api)
 	{
 		oThis.m_oApi.checkLastWork();

-		if (false === oThis.m_oApi.bInit_word_control || (AscCommon.isTouch && undefined === isTouch))
+		if (false === oThis.m_oApi.bInit_word_control || (AscCommon.isTouch && undefined === isTouch) || oThis.m_oApi.isLongAction())
 			return;

 		if (e.preventDefault)
@@ -1725,7 +1725,7 @@ function CEditorPage(api)
 		oThis.m_oApi.checkLastWork();

 		//console.log("up: " + isTouch + ", " + AscCommon.isTouch);
-		if (false === oThis.m_oApi.bInit_word_control || (AscCommon.isTouch && undefined === isTouch))
+		if (false === oThis.m_oApi.bInit_word_control || (AscCommon.isTouch && undefined === isTouch) || oThis.m_oApi.isLongAction())
 			return;
 		//if (true == global_mouseEvent.IsLocked)
 		//    return;

--- a/word/api.js
+++ b/word/api.js
@@ -478,6 +478,8 @@

 							_blockStd = null;

+							window.g_asc_plugins.api.asc_Recalculate();
+
 							setTimeout(function() {
 								window.g_asc_plugins.api.__content_control_worker.run();
 							}, 1);