Merge branch release/v9.3.0 into develop

Don't allow to insert other forms inside a fixed labeled checkbox

api.js

@@ -309,7 +309,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		oLogicDocument.RemoveTextSelection();
 		if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content))
 		{
-			oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlList, undefined, undefined, isComboBox);
+			oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlList);
 
 			var oCC;
 			if (isComboBox)
@@ -327,6 +327,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 			if (oCC && oCommonPr)
 				oCC.SetContentControlPr(oCommonPr);
 
+			oLogicDocument.AddMacroData(AscDFH.historydescription_Document_AddContentControlList, {isComboBox : isComboBox});
 			oLogicDocument.Recalculate();
 			oLogicDocument.UpdateInterface();
 			oLogicDocument.UpdateSelection();
@@ -344,7 +345,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		oLogicDocument.RemoveTextSelection();
 		if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content))
 		{
-			oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlList, undefined, undefined, true);
+			oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlDatePicker, undefined, undefined, true);
 			
 			let dateTimePr = null;
 			let formPr     = null;
@@ -493,7 +494,17 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		if (!form || !form.IsForm())
 			return;
 		
-		return this.private_SetFormValue(form.GetId(), value);
+		if (typeof(value) === "string")
+		{
+			let _t = this;
+			AscFonts.FontPickerByCharacter.checkText(value, this, function() {
+				_t.private_SetFormValue(form.GetId(), value);
+			});
+		}
+		else
+		{
+			this.private_SetFormValue(form.GetId(), value);
+		}
 	};
 	window['Asc']['asc_docs_api'].prototype['asc_GetFormValue'] = window['Asc']['asc_docs_api'].prototype.asc_GetFormValue = function(formId)
 	{
@@ -727,6 +738,10 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 	{
 		let form = logicDocument.GetContentControl();
 		
+		let mainForm = form ? form.GetMainForm() : null;
+		if (mainForm && mainForm.IsLabeledCheckBox())
+			return mainForm.MoveCursorOutsideForm(false);
+		
 		if (!form || !form.IsForm() || (form.IsComplexForm() && !isComplex))
 			return;
 		

apiBuilder.js

@@ -53,7 +53,7 @@
 	 * @class
 	 * @name Api
 	 */
-	var Api = window["Asc"]["asc_docs_api"] || window["Asc"]["spreadsheet_api"];
+	var Api = AscBuilder.Word.Api;
  
 	/**
 	 * Common form properties.
@@ -189,7 +189,7 @@
 	 * @returns {ApiTextForm}
 	 * @see office-js-api/Examples/Forms/Api/Methods/CreateTextForm.js
 	 */
-	Api.prototype.CreateTextForm = function(formPr)
+	Api.CreateTextForm = function(formPr)
 	{
 		return executeNoFormLockCheck(function()
 		{
@@ -210,7 +210,7 @@
 	 * @returns {ApiCheckBoxForm}
 	 * @see office-js-api/Examples/Forms/Api/Methods/CreateCheckBoxForm.js
 	 */
-	Api.prototype.CreateCheckBoxForm = function(formPr)
+	Api.CreateCheckBoxForm = function(formPr)
 	{
 		return executeNoFormLockCheck(function()
 		{
@@ -285,7 +285,7 @@
 	 * @returns {ApiComboBoxForm}
 	 * @see office-js-api/Examples/Forms/Api/Methods/CreateComboBoxForm.js
 	 */
-	Api.prototype.CreateComboBoxForm = function(formPr)
+	Api.CreateComboBoxForm = function(formPr)
 	{
 		return executeNoFormLockCheck(function()
 		{
@@ -355,7 +355,7 @@
 	 * @returns {ApiPictureForm}
 	 * @see office-js-api/Examples/Forms/Api/Methods/CreatePictureForm.js
 	 */
-	Api.prototype.CreatePictureForm = function(formPr)
+	Api.CreatePictureForm = function(formPr)
 	{
 		return executeNoFormLockCheck(function()
 		{
@@ -407,7 +407,7 @@
 	 * @returns {ApiDateForm}
 	 * @see office-js-api/Examples/Forms/Api/Methods/CreateDateForm.js
 	 */
-	Api.prototype.CreateDateForm = function(formPr)
+	Api.CreateDateForm = function(formPr)
 	{
 		return executeNoFormLockCheck(function()
 		{
@@ -428,7 +428,7 @@
 	 * @returns {ApiComplexForm}
 	 * @see office-js-api/Examples/Forms/Api/Methods/CreateComplexForm.js
 	 */
-	Api.prototype.CreateComplexForm = function(formPr)
+	Api.CreateComplexForm = function(formPr)
 	{
 		return executeNoFormLockCheck(function()
 		{
@@ -800,12 +800,12 @@
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Export
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-	Api.prototype["CreateTextForm"]     = Api.prototype.CreateTextForm;
-	Api.prototype["CreatePictureForm"]  = Api.prototype.CreatePictureForm;
-	Api.prototype["CreateDateForm"]		= Api.prototype.CreateDateForm;
-	Api.prototype["CreateCheckBoxForm"] = Api.prototype.CreateCheckBoxForm;
-	Api.prototype["CreateComboBoxForm"] = Api.prototype.CreateComboBoxForm;
-	Api.prototype["CreateComplexForm"]	= Api.prototype.CreateComplexForm;
+	Api["CreateTextForm"]     = Api.CreateTextForm;
+	Api["CreatePictureForm"]  = Api.CreatePictureForm;
+	Api["CreateDateForm"]     = Api.CreateDateForm;
+	Api["CreateCheckBoxForm"] = Api.CreateCheckBoxForm;
+	Api["CreateComboBoxForm"] = Api.CreateComboBoxForm;
+	Api["CreateComplexForm"]  = Api.CreateComplexForm;
 	
 	ApiDocument.prototype["InsertTextForm"] = ApiDocument.prototype.InsertTextForm;
 	ApiDocument.prototype["GetFormRoles"]   = ApiDocument.prototype.GetFormRoles;

apiPlugins.js

@@ -168,6 +168,29 @@
 
 		return "";
 	};
+	/**
+	 * Checks whether the specified form has been digitally signed.
+	 * @memberof Api
+	 * @typeofeditors ["CDE"]
+	 * @alias IsFormSigned
+	 * @returns {boolean} Returns true if the form is signed, false otherwise.
+	 * @since 9.3.0
+	 * @see office-js-api/Examples/Plugins/Forms/Api/Methods/IsFormSigned.js
+	 */
+	Api.prototype["pluginMethod_IsFormSigned"] = function()
+	{
+		let signatures = this.signatures;
+		if (!signatures || !Array.isArray(signatures))
+			return false;
+		
+		for (let i = 0; i < signatures.length; ++i)
+		{
+			if (signatures[i].isForm)
+				return true;
+		}
+		
+		return false;
+	};
 
 })(window);
 

oform/OForm.js

@@ -718,8 +718,6 @@
 		if (!logicDocument)
 			return;
 		
-		this.onEndAction();
-		
 		logicDocument.UpdateInterface();
 		logicDocument.FinalizeAction();
 	};