Merge branch hotfix/v8.2.2 into develop

ONLYOFFICE · Dec 9, 2024 · e9d0c57 · e9d0c57
2 parents 85c2d58 + 2266e25
commit e9d0c57
Show file tree

Hide file tree

Showing 8 changed files with 1,463 additions and 1,322 deletions.
diff --git a/cell/apiBuilder.js b/cell/apiBuilder.js
diff --git a/cell/model/FormulaObjects/parserFormula.js b/cell/model/FormulaObjects/parserFormula.js
@@ -666,7 +666,7 @@ parserHelp.setDigitSeparator(AscCommon.g_oDefaultCultureInfo.NumberDecimalSepara
 		return res;
 	};
 
-	cBaseType.prototype.toArray = function (putValue, checkOnError, fPrepareElem) {
+	cBaseType.prototype.toArray = function (putValue, checkOnError, fPrepareElem, bSaveBoolean) {
 		let arr = [];
 		if (this.getMatrix) {
 			arr = this.getMatrix();
@@ -690,7 +690,11 @@ parserHelp.setDigitSeparator(AscCommon.g_oDefaultCultureInfo.NumberDecimalSepara
 								}
 							}
 							if (putValue) {
-								arr[i][j] = arr[i][j].getValue();
+								if (bSaveBoolean && arr[i][j].type === cElementType.bool) {
+									arr[i][j] = arr[i][j].toBool();
+								} else {
+									arr[i][j] = arr[i][j].getValue();
+								}
 							}
 						}
 					}

diff --git a/common/Scrolls/mobileTouchManagerBase.js b/common/Scrolls/mobileTouchManagerBase.js
@@ -2698,10 +2698,12 @@
 				}
 			}
 			if (isShow)
-				AscCommon.g_inputContext.HtmlArea.focus();
+			{
+				AscCommon.g_inputContext.showKeyboard();
 
-			if (this.isCheckFocusOnClick)
-				this.isCheckFocusOnClickValue = true;
+				if (this.isCheckFocusOnClick)
+					this.isCheckFocusOnClickValue = true;
+			}
 		}
 	};
 
@@ -2716,7 +2718,7 @@
 		if (this.isCheckFocusOnClickValue === true)
 		{
 			if (AscCommon.g_inputContext)
-				AscCommon.g_inputContext.HtmlArea.focus();
+				AscCommon.g_inputContext.showKeyboard();
 			this.isCheckFocusOnClickValue = false;
 		}
 

diff --git a/common/text_input2.js b/common/text_input2.js
@@ -122,8 +122,9 @@
 
 		// параметры для показа/скрытия виртуальной клавиатуры.
 		this.isHardCheckKeyboard = AscCommon.AscBrowser.isSailfish;
+
 		this.virtualKeyboardClickTimeout = -1;
-		this.virtualKeyboardClickPrevent = false;
+		this.virtualKeyboardReadOnly_ShowKeyboard = AscCommon.AscBrowser.isAndroid && AscCommon.AscBrowser.isMozilla;
 
 		// для сброса текста при фокусе
 		this.checkClearTextOnFocusTimerId = -1;
@@ -1189,7 +1190,9 @@
 		if (AscCommon.AscBrowser.isAndroid)
 		{
 			this.setReadOnlyWrapper(true);
-			this.virtualKeyboardClickPrevent = true;
+
+			if (this.virtualKeyboardReadOnly_ShowKeyboard)
+				return;
 
 			this.virtualKeyboardClickTimeout = setTimeout(function ()
 			{
@@ -1205,14 +1208,16 @@
 
 		if (AscCommon.AscBrowser.isAndroid)
 		{
+			if (this.virtualKeyboardReadOnly_ShowKeyboard)
+				return;
+
 			if (-1 != this.virtualKeyboardClickTimeout)
 			{
 				clearTimeout(this.virtualKeyboardClickTimeout);
 				this.virtualKeyboardClickTimeout = -1;
 			}
 
 			this.setReadOnlyWrapper(false);
-			this.virtualKeyboardClickPrevent = false;
 		}
 	};
 	CTextInputPrototype.preventVirtualKeyboard_Hard = function()
@@ -1224,6 +1229,22 @@
 		this.setReadOnlyWrapper(false);
 	};
 
+	CTextInputPrototype.showKeyboard = function()
+	{
+		if (this.virtualKeyboardReadOnly_ShowKeyboard)
+		{
+			if (this.HtmlArea.readOnly === true)
+			{
+				this.setReadOnlyWrapper(false);
+			}
+		}
+
+		if (!this.Api.asc_IsFocus())
+			this.Api.asc_enableKeyEvents(true);
+		else
+			focusHtmlElement(this.HtmlArea);
+	}
+
 	CTextInputPrototype.checkViewMode = function()
 	{
 		let oldDisableKeyboard = this.isDisableKeyboard;

diff --git a/configs/slide.json b/configs/slide.json
@@ -150,6 +150,7 @@
 			"cell/model/Workbook.js",
 			"cell/model/Serialize.js",
 			"cell/model/CellInfo.js",
+			"cell/model/HeaderFooter.js",
 			"cell/view/DrawingObjectsController.js",
 
 			"word/Editor/Paragraph/RunContent/Types.js",

diff --git a/configs/word.json b/configs/word.json
@@ -153,6 +153,7 @@
 			"cell/model/Workbook.js",
 			"cell/model/Serialize.js",
 			"cell/model/CellInfo.js",
+			"cell/model/HeaderFooter.js",
 
 			"word/Editor/Paragraph/RunContent/Types.js",
 			"word/Math/mathTypes.js",

diff --git a/slide/Drawing/mobileTouchManager.js b/slide/Drawing/mobileTouchManager.js
@@ -1023,7 +1023,7 @@
 
 		this.removeHandlersOnClick();
 
-		if (!this.Api.asc_IsFocus())
+		if (!this.Api.asc_IsFocus() && !this.Api.isMobileVersion)
 			this.Api.asc_enableKeyEvents(true);
 
 		var oWordControl = this.Api.WordControl;

diff --git a/word/Drawing/mobileTouchManager.js b/word/Drawing/mobileTouchManager.js
@@ -748,7 +748,7 @@
 
 		this.removeHandlersOnClick();
 
-		if (!this.Api.asc_IsFocus())
+		if (!this.Api.asc_IsFocus() && !this.Api.isMobileVersion)
 			this.Api.asc_enableKeyEvents(true);
 
 		var oWordControl = this.Api.WordControl;