Move InitClass to AscCommon namespace

api.js

@@ -80,7 +80,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 			AscFonts.FontPickerByCharacter.getFontBySymbol(nUncheckedSymbol);
 		}
 
-		function private_ApplyPrToCheckBox(oCC)
+		function private_ApplyPrToCheckBox(oCC, checkBoxPr)
 		{
 			if (!oCC)
 				return;
@@ -94,7 +94,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 				else
 					private_CheckFormKey(oCC, oLogicDocument);
 			}
-
+			
 			if (oCommonPr)
 				oCC.SetContentControlPr(oCommonPr);
 		}
@@ -122,13 +122,13 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 					CheckType : AscCommon.changestype_Paragraph_Content
 				}))
 				{
-					oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlCheckBox);
+					oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlCheckBox, undefined, undefined, true);
 					oLogicDocument.RemoveSelection();
 
 					for (let nIndex = 0, nCount = arrSelectedParagraphs.length; nIndex < nCount; ++nIndex)
 					{
 						let oCC = arrSelectedParagraphs[nIndex].AddCheckBoxToStartPos(oPr);
-						private_ApplyPrToCheckBox(oCC);
+						private_ApplyPrToCheckBox(oCC, oPr);
 					}
 
 					oLogicDocument.LoadDocumentState(oState);
@@ -146,10 +146,10 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 				oLogicDocument.RemoveTextSelection();
 				if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content))
 				{
-					oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlCheckBox);
+					oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlCheckBox, undefined, undefined, true);
 
 					var oCC = oLogicDocument.AddContentControlCheckBox(oPr);
-					private_ApplyPrToCheckBox(oCC);
+					private_ApplyPrToCheckBox(oCC, oPr);
 
 					oLogicDocument.UpdateInterface();
 					oLogicDocument.Recalculate();
@@ -182,7 +182,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		oLogicDocument.RemoveTextSelection();
 		if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content))
 		{
-			oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlPicture);
+			oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlPicture, undefined, undefined, true);
 
 			// 150x32pt for Signature
 			let w = isSignature ? 150 / 72 * 25.4 : undefined;
@@ -309,7 +309,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		oLogicDocument.RemoveTextSelection();
 		if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content))
 		{
-			oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlList);
+			oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlList, undefined, undefined, isComboBox);
 
 			var oCC;
 			if (isComboBox)
@@ -344,7 +344,7 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 		oLogicDocument.RemoveTextSelection();
 		if (!oLogicDocument.IsSelectionLocked(AscCommon.changestype_Paragraph_Content))
 		{
-			oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlList);
+			oLogicDocument.StartAction(AscDFH.historydescription_Document_AddContentControlList, undefined, undefined, true);
 			
 			let dateTimePr = null;
 			let formPr     = null;
@@ -464,8 +464,10 @@ window["AscOForm"] = window.AscOForm = AscOForm;
 			return null;
 
 		let mainForm = form.GetMainForm();
+		if (!mainForm || !mainForm.IsComplexForm() || mainForm.IsLabeledCheckBox())
+			return null;
 
-		return (mainForm.IsComplexForm() ? mainForm : null);
+		return mainForm;
 	};
 	window['Asc']['asc_docs_api'].prototype['asc_ConvertFormToJson'] = window['Asc']['asc_docs_api'].prototype.asc_ConvertFormToJson = function(form)
 	{

oform/format/Document.js

@@ -65,7 +65,7 @@
 		this.UserMasters  = [];
 		this.FieldMasters = [];
 	}
-	AscFormat.InitClass(CDocument, AscOForm.CBaseFormatObject, AscDFH.historyitem_type_OForm_Document);
+	AscCommon.InitClass(CDocument, AscOForm.CBaseFormatObject, AscDFH.historyitem_type_OForm_Document);
 	CDocument.prototype.clear = function()
 	{
 		// TODO: fields?

oform/format/FieldGroup.js

@@ -50,7 +50,7 @@
 		
 		this.Parent = null;
 	}
-	AscFormat.InitClass(CFieldGroup, AscOForm.CBaseFormatObject, AscDFH.historyitem_type_OForm_FieldGroup);
+	AscCommon.InitClass(CFieldGroup, AscOForm.CBaseFormatObject, AscDFH.historyitem_type_OForm_FieldGroup);
 	CFieldGroup.prototype.setParent = function(parent)
 	{
 		if (this.Parent === parent)

oform/format/FieldMaster.js

@@ -51,7 +51,7 @@
 		if (true === generateId)
 			this.setFieldId(AscCommon.CreateGUID());
 	}
-	AscFormat.InitClass(CFieldMaster, AscOForm.CBaseFormatObject, AscDFH.historyitem_type_OForm_FieldMaster);
+	AscCommon.InitClass(CFieldMaster, AscOForm.CBaseFormatObject, AscDFH.historyitem_type_OForm_FieldMaster);
 	CFieldMaster.prototype.setLogicField = function(logicField)
 	{
 		this.Field = logicField;

oform/format/User.js

@@ -50,7 +50,7 @@
 		if (userMaster)
 			this.setUserMaster(userMaster);
 	}
-	AscFormat.InitClass(CUser, AscOForm.CBaseFormatObject, AscDFH.historyitem_type_OForm_User);
+	AscCommon.InitClass(CUser, AscOForm.CBaseFormatObject, AscDFH.historyitem_type_OForm_User);
 	CUser.prototype.setUserMaster = function(userMaster)
 	{
 		if (this.UserMaster === userMaster)

oform/format/UserMaster.js

@@ -71,7 +71,7 @@
 		
 		this.Parent = null;
 	}
-	AscFormat.InitClass(CUserMaster, AscOForm.CBaseFormatObject, AscDFH.historyitem_type_OForm_UserMaster);
+	AscCommon.InitClass(CUserMaster, AscOForm.CBaseFormatObject, AscDFH.historyitem_type_OForm_UserMaster);
 	CUserMaster.prototype.setParent = function(parent)
 	{
 		if (this.Parent === parent)