For bug #63437

Fix an issue with updating image form properties when adding it

api.js

@@ -186,7 +186,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 				oCC.SetFormPr(oFormPr);
 				oCC.UpdatePlaceHolderTextPrForForm();
 				private_CheckFormKey(oCC, oLogicDocument);
-
+				oLogicDocument.Recalculate(true);
 				oFormParaDrawing = oCC.ConvertFormToFixed();
 				oCC.SetPictureFormPr(new AscCommon.CSdtPictureFormPr());
 				var aDrawings = oCC.GetAllDrawingObjects();
@@ -240,6 +240,11 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 					oLogicDocument.Recalculate(true);
 					oCC.UpdatePictureFormLayout();
 				}
+				else
+				{
+					oCC.ReplaceContentWithPlaceHolder();
+					oCC.ApplyPicturePr(true);
+				}
 			}
 
 			if (oCC && oCommonPr)
@@ -488,6 +493,11 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 			|| !oForm.IsForm())
 			return;
 		
+		// При проверке лока внутри параграфа мы ориентируемся на выделение внутри этого параграфа
+		// поэтому нужно выделить форму
+		let state = oLogicDocument.SaveDocumentState();
+		oForm.SelectContentControl();
+		
 		let oParagraph = oForm.GetParagraph();
 		
 		oForm.SkipFillingFormModeCheck(true);
@@ -499,10 +509,12 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 				CheckType : AscCommon.changestype_Paragraph_Content
 			}, true, oLogicDocument.IsFillingFormMode()))
 		{
+			oLogicDocument.LoadDocumentState(state);
 			oForm.SkipFillingFormModeCheck(false);
 			oForm.SkipSpecialContentControlLock(false);
 			return;
 		}
+		oLogicDocument.LoadDocumentState(state);
 		oForm.SkipFillingFormModeCheck(false);
 		oForm.SkipSpecialContentControlLock(false);
 		
@@ -645,12 +657,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 			logicDocument.Recalculate(true);
 			let drawing = form.ConvertFormToFixed();
 			if (drawing)
-			{
-				let drawingPr = new Asc.asc_CImgProperty();
-				drawingPr.asc_putWrappingStyle(Asc.c_oAscWrapStyle2.Square);
-				drawing.Set_Props(drawingPr);
 				drawing.SelectAsDrawing();
-			}
 		}
 	}
 	

apiBuilder.js

@@ -38,11 +38,13 @@
 	// Import
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	const AscBuilder         = window["AscBuilder"];
-	const ApiDocument        = AscBuilder.ApiDocument;
-	const GetStringParameter = AscBuilder.GetStringParameter;
-	const GetBoolParameter   = AscBuilder.GetBoolParameter;
-	const GetNumberParameter = AscBuilder.GetNumberParameter;
-	const GetArrayParameter  = AscBuilder.GetArrayParameter;
+
+	const ApiDocument            = AscBuilder.ApiDocument;
+	const GetStringParameter     = AscBuilder.GetStringParameter;
+	const GetBoolParameter       = AscBuilder.GetBoolParameter;
+	const GetNumberParameter     = AscBuilder.GetNumberParameter;
+	const GetArrayParameter      = AscBuilder.GetArrayParameter;
+	const executeNoFormLockCheck = AscBuilder.executeNoFormLockCheck;
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	/**
@@ -149,6 +151,19 @@
 	 * @typedef {FormPrBase | PictureFormPrBase} PictureFormPr
 	 */
 
+	/**
+	 * Specific date form properties.
+	 * @typedef {Object} DateFormPrBase
+	 * @property {string} format	- The date format, ex: mm.dd.yyyy
+	 * @property {string} lang		- The date language. Possible value for this parameter is a language identifier as defined by
+	 * RFC 4646/BCP 47. Example: "en-CA".
+	 */
+
+	/**
+	 * Date form properties.
+	 * @typedef {FormPrBase | DateFormPrBase} DateFormPr
+	 */
+
 	/**
 	 * Creates a text field with the specified text field properties.
 	 * @memberof Api
@@ -157,13 +172,16 @@
 	 */
 	Api.prototype.CreateTextForm = function(oFormPr)
 	{
-		if (!oFormPr)
-			oFormPr = {};
-
-		let form = CreateCommonForm(oFormPr);
-		ApplyTextFormPr(form, oFormPr);
-		CheckFormKey(form);
-		return new AscBuilder.ApiTextForm(form);
+		return executeNoFormLockCheck(function()
+		{
+			if (!oFormPr)
+				oFormPr = {};
+			
+			let form = CreateCommonForm(oFormPr);
+			ApplyTextFormPr(form, oFormPr);
+			CheckFormKey(form);
+			return new AscBuilder.ApiTextForm(form);
+		}, this);
 	};
 	/**
 	 * Creates a checkbox / radio button with the specified checkbox / radio button properties.
@@ -173,67 +191,70 @@
 	 */
 	Api.prototype.CreateCheckBoxForm = function(oFormPr)
 	{
-		if (!oFormPr)
-			oFormPr = {};
-
-		oFormPr["placeholder"] = undefined;
-
-		var oCC;
-		var oCheckboxPr  = new AscCommon.CSdtCheckBoxPr();
-		if (GetBoolParameter(oFormPr["radio"], false))
+		return executeNoFormLockCheck(function()
 		{
-			oCheckboxPr.CheckedSymbol   = 0x25C9;
-			oCheckboxPr.UncheckedSymbol = 0x25CB;
-			oCheckboxPr.GroupKey        = GetStringParameter(oFormPr["key"], "Group1");
-		}
-		else
-		{
-			oCheckboxPr.CheckedSymbol   = 0x2611;
-			oCheckboxPr.UncheckedSymbol = 0x2610;
-		}
-
-		oCheckboxPr.CheckedFont = "Segoe UI Symbol";
-		oCheckboxPr.UncheckedFont = "Segoe UI Symbol";
-
-		var nCheckedSymbol   = oCheckboxPr && oCheckboxPr.CheckedSymbol ? oCheckboxPr.CheckedSymbol : Asc.c_oAscSdtCheckBoxDefaults.CheckedSymbol;
-		var nUncheckedSymbol = oCheckboxPr && oCheckboxPr.UncheckedSymbol ? oCheckboxPr.UncheckedSymbol : Asc.c_oAscSdtCheckBoxDefaults.UncheckedSymbol;
-		var sCheckedFont     = oCheckboxPr && oCheckboxPr.CheckedFont ? oCheckboxPr.CheckedFont : Asc.c_oAscSdtCheckBoxDefaults.CheckedFont;
-		var sUncheckedFont   = oCheckboxPr && oCheckboxPr.UncheckedFont ? oCheckboxPr && oCheckboxPr.UncheckedFont : Asc.c_oAscSdtCheckBoxDefaults.UncheckedFont;
-
-		var isLoadFonts = false;
-		if (!AscCommon.IsAscFontSupport(sCheckedFont, nCheckedSymbol))
-		{
-			isLoadFonts = true;
-			AscFonts.FontPickerByCharacter.getFontBySymbol(nCheckedSymbol);
-		}
-
-		if (!AscCommon.IsAscFontSupport(sUncheckedFont, nUncheckedSymbol))
-		{
-			isLoadFonts = true;
-			AscFonts.FontPickerByCharacter.getFontBySymbol(nUncheckedSymbol);
-		}
-
-		function private_PerformAddCheckBox()
-		{
-			oCC = CreateCommonForm(oFormPr);
-			oCC.ApplyCheckBoxPr(oCheckboxPr);
-		}
-
-		if (isLoadFonts)
-		{
-			var oFonts = {};
-			oFonts[sCheckedFont]   = true;
-			oFonts[sUncheckedFont] = true;
-
-			AscCommon.Check_LoadingDataBeforePrepaste(this, oFonts, {}, private_PerformAddCheckBox);
-		}
-		else
-		{
-			private_PerformAddCheckBox();
-		}
-
-		CheckFormKey(oCC);
-		return new AscBuilder.ApiCheckBoxForm(oCC);
+			if (!oFormPr)
+				oFormPr = {};
+			
+			oFormPr["placeholder"] = undefined;
+			
+			var oCC;
+			var oCheckboxPr = new AscCommon.CSdtCheckBoxPr();
+			if (GetBoolParameter(oFormPr["radio"], false))
+			{
+				oCheckboxPr.CheckedSymbol   = 0x25C9;
+				oCheckboxPr.UncheckedSymbol = 0x25CB;
+				oCheckboxPr.GroupKey        = GetStringParameter(oFormPr["key"], "Group1");
+			}
+			else
+			{
+				oCheckboxPr.CheckedSymbol   = 0x2611;
+				oCheckboxPr.UncheckedSymbol = 0x2610;
+			}
+			
+			oCheckboxPr.CheckedFont   = "Segoe UI Symbol";
+			oCheckboxPr.UncheckedFont = "Segoe UI Symbol";
+			
+			var nCheckedSymbol   = oCheckboxPr && oCheckboxPr.CheckedSymbol ? oCheckboxPr.CheckedSymbol : Asc.c_oAscSdtCheckBoxDefaults.CheckedSymbol;
+			var nUncheckedSymbol = oCheckboxPr && oCheckboxPr.UncheckedSymbol ? oCheckboxPr.UncheckedSymbol : Asc.c_oAscSdtCheckBoxDefaults.UncheckedSymbol;
+			var sCheckedFont     = oCheckboxPr && oCheckboxPr.CheckedFont ? oCheckboxPr.CheckedFont : Asc.c_oAscSdtCheckBoxDefaults.CheckedFont;
+			var sUncheckedFont   = oCheckboxPr && oCheckboxPr.UncheckedFont ? oCheckboxPr && oCheckboxPr.UncheckedFont : Asc.c_oAscSdtCheckBoxDefaults.UncheckedFont;
+			
+			var isLoadFonts = false;
+			if (!AscCommon.IsAscFontSupport(sCheckedFont, nCheckedSymbol))
+			{
+				isLoadFonts = true;
+				AscFonts.FontPickerByCharacter.getFontBySymbol(nCheckedSymbol);
+			}
+			
+			if (!AscCommon.IsAscFontSupport(sUncheckedFont, nUncheckedSymbol))
+			{
+				isLoadFonts = true;
+				AscFonts.FontPickerByCharacter.getFontBySymbol(nUncheckedSymbol);
+			}
+			
+			function private_PerformAddCheckBox()
+			{
+				oCC = CreateCommonForm(oFormPr);
+				oCC.ApplyCheckBoxPr(oCheckboxPr);
+			}
+			
+			if (isLoadFonts)
+			{
+				var oFonts             = {};
+				oFonts[sCheckedFont]   = true;
+				oFonts[sUncheckedFont] = true;
+				
+				AscCommon.Check_LoadingDataBeforePrepaste(this, oFonts, {}, private_PerformAddCheckBox);
+			}
+			else
+			{
+				private_PerformAddCheckBox();
+			}
+			
+			CheckFormKey(oCC);
+			return new AscBuilder.ApiCheckBoxForm(oCC);
+		}, this);
 	};
 	/**
 	 * Creates a combo box / dropdown list with the specified combo box / dropdown list properties.
@@ -243,62 +264,65 @@
 	 */
 	Api.prototype.CreateComboBoxForm = function(oFormPr)
 	{
-		if (!oFormPr)
-			oFormPr = {};
-
-		var oPr = new AscCommon.CSdtComboBoxPr();
-		oPr.AddItem(AscCommon.translateManager.getValue("Choose an item"), "");
-
-		var oCC = CreateCommonForm(oFormPr);
-
-		let sPlaceholder = GetStringParameter(oFormPr["placeholder"], undefined);
-
-		let arrList = GetArrayParameter(oFormPr["items"], []);
-		for (let nIndex = 0, nCount = arrList.length; nIndex < nCount; ++nIndex)
+		return executeNoFormLockCheck(function()
 		{
-			let oItem = arrList[nIndex];
-
-			if (GetStringParameter(oItem, null))
+			if (!oFormPr)
+				oFormPr = {};
+			
+			var oPr = new AscCommon.CSdtComboBoxPr();
+			oPr.AddItem(AscCommon.translateManager.getValue("Choose an item"), "");
+			
+			var oCC = CreateCommonForm(oFormPr);
+			
+			let sPlaceholder = GetStringParameter(oFormPr["placeholder"], undefined);
+			
+			let arrList = GetArrayParameter(oFormPr["items"], []);
+			for (let nIndex = 0, nCount = arrList.length; nIndex < nCount; ++nIndex)
 			{
-				oPr.AddItem(oItem, oItem);
+				let oItem = arrList[nIndex];
+				
+				if (GetStringParameter(oItem, null))
+				{
+					oPr.AddItem(oItem, oItem);
+				}
+				else if (GetArrayParameter(oItem, null))
+				{
+					let sDisplay = GetStringParameter(oItem[0], null);
+					let sValue   = GetStringParameter(oItem[1], null);
+					if (null !== sDisplay && null !== sValue)
+						oPr.AddItem(sDisplay, sValue);
+				}
 			}
-			else if (GetArrayParameter(oItem, null))
+			oPr.SetAutoFit(GetBoolParameter(oFormPr["autoFit"], false));
+			
+			if (!GetBoolParameter(oFormPr["editable"], false))
 			{
-				let sDisplay = GetStringParameter(oItem[0], null);
-				let sValue   = GetStringParameter(oItem[1], null);
-				if (null !== sDisplay && null !== sValue)
-					oPr.AddItem(sDisplay, sValue);
-			}
-		}
-		oPr.SetAutoFit(GetBoolParameter(oFormPr["autoFit"], false));
-
-		if (!GetBoolParameter(oFormPr["editable"], false))
-		{
-			if (sPlaceholder)
-			{
-				oCC.ApplyDropDownListPr(oPr);
+				if (sPlaceholder)
+				{
+					oCC.ApplyDropDownListPr(oPr);
+				}
+				else
+				{
+					oCC.SetDropDownListPr(oPr);
+					oCC.SelectListItem();
+				}
 			}
 			else
 			{
-				oCC.SetDropDownListPr(oPr);
-				oCC.SelectListItem();
+				if (sPlaceholder)
+				{
+					oCC.ApplyComboBoxPr(oPr);
+				}
+				else
+				{
+					oCC.SetComboBoxPr(oPr);
+					oCC.SelectListItem();
+				}
 			}
-		}
-		else
-		{
-			if (sPlaceholder)
-			{
-				oCC.ApplyComboBoxPr(oPr);
-			}
-			else
-			{
-				oCC.SetComboBoxPr(oPr);
-				oCC.SelectListItem();
-			}
-		}
-
-		CheckFormKey(oCC);
-		return new AscBuilder.ApiComboBoxForm(oCC);
+			
+			CheckFormKey(oCC);
+			return new AscBuilder.ApiComboBoxForm(oCC);
+		}, this);
 	};
 	/**
 	 * Creates a picture form with the specified picture form properties.
@@ -308,36 +332,66 @@
 	 */
 	Api.prototype.CreatePictureForm = function(oFormPr)
 	{
-		if (!oFormPr)
-			oFormPr = {};
-
-		if (GetStringParameter("placeholder", null))
-			oFormPr["placeholder"] = AscCommon.translateManager.getValue("Click to load image");
-
-		var oCC = CreateCommonForm(oFormPr);
-		oCC.ApplyPicturePr(true);
-		oCC.ConvertFormToFixed();
-
-		let oPr = new AscCommon.CSdtPictureFormPr();
-
-		let sScale = GetStringParameter(oFormPr["scaleFlag"], undefined);
-		switch (sScale)
+		return executeNoFormLockCheck(function()
 		{
-			case "always": oPr.SetScaleFlag(Asc.c_oAscPictureFormScaleFlag.Always); break;
-			case "never": oPr.SetScaleFlag(Asc.c_oAscPictureFormScaleFlag.Never); break;
-			case "tooBig": oPr.SetScaleFlag(Asc.c_oAscPictureFormScaleFlag.Bigger); break;
-			case "tooSmall": oPr.SetScaleFlag(Asc.c_oAscPictureFormScaleFlag.Smaller); break;
-		}
-
-		oPr.SetConstantProportions(GetBoolParameter(oFormPr["lockAspectRatio"], true));
-		oPr.SetRespectBorders(GetBoolParameter(oFormPr["respectBorders"], false));
-		oPr.SetShiftX(Math.max(0, Math.min(100, GetNumberParameter(oFormPr["shiftX"], 50))) / 100);
-		oPr.SetShiftY(Math.max(0, Math.min(100, GetNumberParameter(oFormPr["shiftY"], 50))) / 100);
-
-		oCC.SetPictureFormPr(oPr);
-
-		CheckFormKey(oCC);
-		return new AscBuilder.ApiPictureForm(oCC);
+			if (!oFormPr)
+				oFormPr = {};
+			
+			if (GetStringParameter("placeholder", null))
+				oFormPr["placeholder"] = AscCommon.translateManager.getValue("Click to load image");
+			
+			var oCC = CreateCommonForm(oFormPr);
+			oCC.ApplyPicturePr(true);
+			oCC.ConvertFormToFixed();
+			
+			let oPr = new AscCommon.CSdtPictureFormPr();
+			
+			let sScale = GetStringParameter(oFormPr["scaleFlag"], undefined);
+			switch (sScale)
+			{
+				case "always":
+					oPr.SetScaleFlag(Asc.c_oAscPictureFormScaleFlag.Always);
+					break;
+				case "never":
+					oPr.SetScaleFlag(Asc.c_oAscPictureFormScaleFlag.Never);
+					break;
+				case "tooBig":
+					oPr.SetScaleFlag(Asc.c_oAscPictureFormScaleFlag.Bigger);
+					break;
+				case "tooSmall":
+					oPr.SetScaleFlag(Asc.c_oAscPictureFormScaleFlag.Smaller);
+					break;
+			}
+			
+			oPr.SetConstantProportions(GetBoolParameter(oFormPr["lockAspectRatio"], true));
+			oPr.SetRespectBorders(GetBoolParameter(oFormPr["respectBorders"], false));
+			oPr.SetShiftX(Math.max(0, Math.min(100, GetNumberParameter(oFormPr["shiftX"], 50))) / 100);
+			oPr.SetShiftY(Math.max(0, Math.min(100, GetNumberParameter(oFormPr["shiftY"], 50))) / 100);
+			
+			oCC.SetPictureFormPr(oPr);
+			
+			CheckFormKey(oCC);
+			return new AscBuilder.ApiPictureForm(oCC);
+		}, this);
+	};
+	/**
+	 * Creates a date form with the specified date form properties.
+	 * @memberof Api
+	 * @param {DateFormPr} oFormPr - Date form properties.
+	 * @returns {ApiDateForm}
+	 */
+	Api.prototype.CreateDateForm = function(oFormPr)
+	{
+		return executeNoFormLockCheck(function()
+		{
+			if (!oFormPr)
+				oFormPr = {};
+			
+			let form = CreateCommonForm(oFormPr);
+			ApplyDateFormPr(form, oFormPr);
+			CheckFormKey(form);
+			return new AscBuilder.ApiDateForm(form);
+		}, this);
 	};
 	/**
 	 * Inserts a text box with the specified text box properties over the selected text.
@@ -347,26 +401,29 @@
 	 */
 	ApiDocument.prototype.InsertTextForm = function(oFormPr)
 	{
-		if (!oFormPr)
-			oFormPr = {};
-		
-		let logicDocument = this.Document;
-		let placeholder = GetStringParameter(oFormPr["placeholder"], undefined);
-		if (GetBoolParameter(oFormPr["placeholderFromSelection"], false))
-			placeholder = logicDocument.GetSelectedText();
-		
-		if (!GetBoolParameter(oFormPr["keepSelectedTextInForm"], true))
-			logicDocument.RemoveBeforePaste();
-		
-		let contentControl = logicDocument.AddContentControl(c_oAscSdtLevelType.Inline);
-		if (!contentControl)
-			return null;
-		
-		ApplyCommonFormPr(contentControl, oFormPr);
-		SetFormPlaceholder(contentControl, placeholder);
-		ApplyTextFormPr(contentControl, oFormPr, true);
-		CheckFormKey(contentControl);
-		return new AscBuilder.ApiTextForm(contentControl);
+		return executeNoFormLockCheck(function()
+		{
+			if (!oFormPr)
+				oFormPr = {};
+			
+			let logicDocument = this.Document;
+			let placeholder   = GetStringParameter(oFormPr["placeholder"], undefined);
+			if (GetBoolParameter(oFormPr["placeholderFromSelection"], false))
+				placeholder = logicDocument.GetSelectedText();
+			
+			if (!GetBoolParameter(oFormPr["keepSelectedTextInForm"], true))
+				logicDocument.RemoveBeforePaste();
+			
+			let contentControl = logicDocument.AddContentControl(c_oAscSdtLevelType.Inline);
+			if (!contentControl)
+				return null;
+			
+			ApplyCommonFormPr(contentControl, oFormPr);
+			SetFormPlaceholder(contentControl, placeholder);
+			ApplyTextFormPr(contentControl, oFormPr, true);
+			CheckFormKey(contentControl);
+			return new AscBuilder.ApiTextForm(contentControl);
+		}, this);
 	};
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	// Private area
@@ -412,6 +469,19 @@
 		textFormPr.SetWidth((GetNumberParameter(formPr["cellWidth"], 0) * 72 * 20 / 25.4) | 0);
 		form.ApplyTextFormPr(textFormPr, keepContent);
 	}
+	function ApplyDateFormPr(form, formPr)
+	{
+		let datePickerPr = new AscCommon.CSdtDatePickerPr();
+
+		var nLcid = Asc.g_oLcidNameToIdMap[formPr["lang"]];
+		if (undefined == nLcid)
+			nLcid = 1033;
+
+		datePickerPr.SetDateFormat(GetStringParameter(formPr["format"], "mm/dd/yyyy"));
+		datePickerPr.SetLangId(nLcid);
+
+		form.ApplyDatePickerPr(datePickerPr);
+	}
 	function CheckFormKey(form)
 	{
 		let logicDocument = editor && editor.WordControl && editor.WordControl.m_oLogicDocument;
@@ -438,6 +508,7 @@
 	////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 	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;