Revert "move paragraph to common"

This reverts commit 22066ff0.

build/configs/webexcel.json

@@ -27,7 +27,6 @@
 		"../cell/model/History.js",
 		"../common/editor/document.js",
 		"../common/editor/documentContent.js",
-		"../common/editor/paragraph.js",
 		
 		"../common/Shapes/EditorSettings.js",
 		"../common/Shapes/Serialize.js",
@@ -133,6 +132,7 @@
         "../word/Editor/Field.js",
         "../word/Editor/Run.js",
         "../word/Editor/Math.js",
+        "../word/Editor/Paragraph.js",
         "../word/Editor/Paragraph_Recalculate.js",
         "../word/Editor/Sections.js",
         "../word/Editor/Numbering.js",

build/configs/webpowerpoint.json

@@ -27,7 +27,6 @@
 		"../word/Editor/History.js",
 		"../common/editor/document.js",
 		"../common/editor/documentContent.js",
-		"../common/editor/paragraph.js",
 		
 		"../common/Shapes/EditorSettings.js",
 		"../common/Shapes/Serialize.js",
@@ -137,6 +136,7 @@
         "../word/Math/accent.js",
         "../word/Math/borderBox.js",
         "../word/Editor/FlowObjects.js",
+        "../word/Editor/Paragraph.js",
         "../word/Editor/Paragraph_Recalculate.js",
         "../word/Editor/HeaderFooter.js",
         "../word/Editor/Math.js",

build/configs/webword.json

@@ -30,7 +30,6 @@
 		"../word/Editor/History.js",
 		"../common/editor/document.js",
 		"../common/editor/documentContent.js",
-		"../common/editor/paragraph.js",
 		
 		"../common/Shapes/EditorSettings.js",
 		"../common/Shapes/Serialize.js",
@@ -107,6 +106,7 @@
         "../word/Editor/Field.js",
         "../word/Editor/Run.js",
         "../word/Editor/Math.js",
+        "../word/Editor/Paragraph.js",
         "../word/Editor/Paragraph_Recalculate.js",
         "../word/Editor/Sections.js",
         "../word/Editor/Numbering.js",

common/commonDefines.js

@@ -897,10 +897,6 @@ var changestype_2_Element_and_Type       = 4; // Проверяем возмож
 var changestype_2_ElementsArray_and_Type = 5; // Аналогично предыдущему, только идет массив элементов
 var changestype_2_AdditionalTypes        = 6; // Дополнительные проверки типа 1
 
-  var comments_NoComment        = 0;
-  var comments_NonActiveComment = 1;
-  var comments_ActiveComment    = 2;
-
 var contentchanges_Add    = 1;
 var contentchanges_Remove = 2;
 
@@ -1446,9 +1442,5 @@ window['Asc']['c_oAscMaxCellOrCommentLength'] = window['Asc'].c_oAscMaxCellOrCom
   window["AscCommon"].contentchanges_Add = contentchanges_Add;
   window["AscCommon"].contentchanges_Remove = contentchanges_Remove;
 
-  window["AscCommon"].comments_NoComment = comments_NoComment;
-  window["AscCommon"].comments_NonActiveComment = comments_NonActiveComment;
-  window["AscCommon"].comments_ActiveComment = comments_ActiveComment;
-
   window["AscCommon"].offlineMode = offlineMode;
 })(window);

slide/Editor/Format/Comments.js

@@ -10,6 +10,10 @@
 var g_oTableId = AscCommon.g_oTableId;
 var History = AscCommon.History;
 
+var comments_NoComment        = 0;
+var comments_NonActiveComment = 1;
+var comments_ActiveComment    = 2;
+
 function ParaComment(Start, Id)
 {
     this.Id = AscCommon.g_oIdCounter.Get_NewId();

word/Editor/Comments.js

@@ -535,6 +535,10 @@ function CComment(Parent, Data)
     g_oTableId.Add( this, this.Id );
 }
 
+var comments_NoComment        = 0;
+var comments_NonActiveComment = 1;
+var comments_ActiveComment    = 2;
+
 function CComments()
 {
     this.Id     = AscCommon.g_oIdCounter.Get_NewId();

word/Editor/Math.js

@@ -2672,7 +2672,7 @@ ParaMath.prototype.Draw_HighLights = function(PDSH)
             var CommentsFlag  = PDSH.CommentsFlag;
 
             var Bounds = this.Root.Get_LineBound(PDSH.Line, PDSH.Range);
-            Comm.Add(Bounds.Y, Bounds.Y + Bounds.H, Bounds.X, Bounds.X + Bounds.W, 0, 0, 0, 0, { Active : CommentsFlag === AscCommon.comments_ActiveComment ? true : false, CommentId : CommentId } );
+            Comm.Add(Bounds.Y, Bounds.Y + Bounds.H, Bounds.X, Bounds.X + Bounds.W, 0, 0, 0, 0, { Active : CommentsFlag === comments_ActiveComment ? true : false, CommentId : CommentId } );
         }
 
         if (null !== CollFirst)

common/editor/paragraph.js → word/Editor/Paragraph.js

-/*
- *
- * (c) Copyright Ascensio System Limited 2010-2016
- *
- * This program is freeware. You can redistribute it and/or modify it under the terms of the GNU 
- * General Public License (GPL) version 3 as published by the Free Software Foundation (https://www.gnu.org/copyleft/gpl.html). 
- * In accordance with Section 7(a) of the GNU GPL its Section 15 shall be amended to the effect that 
- * Ascensio System SIA expressly excludes the warranty of non-infringement of any third-party rights.
- *
- * THIS PROGRAM IS DISTRIBUTED WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF MERCHANTABILITY OR
- * FITNESS FOR A PARTICULAR PURPOSE. For more details, see GNU GPL at https://www.gnu.org/copyleft/gpl.html
- *
- * You can contact Ascensio System SIA by email at sales@onlyoffice.com
- *
- * The interactive user interfaces in modified source and object code versions of ONLYOFFICE must display 
- * Appropriate Legal Notices, as required under Section 5 of the GNU GPL version 3.
- *
- * Pursuant to Section 7  3(b) of the GNU GPL you must retain the original ONLYOFFICE logo which contains 
- * relevant author attributions when distributing the software. If the display of the logo in its graphic 
- * form is not reasonably feasible for technical reasons, you must include the words "Powered by ONLYOFFICE" 
- * in every copy of the program you distribute. 
- * Pursuant to Section 7  3(e) we decline to grant you any rights under trademark law for use of our trademarks.
- *
-*/
 "use strict";
 
 // При добавлении нового элемента ParagraphContent, добавить его обработку в
@@ -14344,7 +14320,7 @@ function CParagraphDrawStateHightlights()
 
     this.DrawComments = true;
     this.Comments     = [];
-    this.CommentsFlag = AscCommon.comments_NoComment;
+    this.CommentsFlag = comments_NoComment;
 
     this.SearchCounter = 0;
 
@@ -14437,14 +14413,14 @@ CParagraphDrawStateHightlights.prototype =
         var CommLen = this.Comments.length;
 
         // Сначала проверим есть ли вообще комментарии
-        this.CommentsFlag = ( CommLen > 0 ? AscCommon.comments_NonActiveComment : AscCommon.comments_NoComment );
+        this.CommentsFlag = ( CommLen > 0 ? comments_NonActiveComment : comments_NoComment );
 
         // Проверим является ли какой-либо комментарий активным
         for ( var CurPos = 0; CurPos < CommLen; CurPos++ )
         {
             if ( CurComment === this.Comments[CurPos] )
             {
-                this.CommentsFlag = AscCommon.comments_ActiveComment;
+                this.CommentsFlag = comments_ActiveComment;
                 break
             }
         }

word/Editor/Run.js

@@ -4259,8 +4259,8 @@ ParaRun.prototype.Draw_HighLights = function(PDSH)
                 if ( para_Drawing === ItemType && !Item.Is_Inline() )
                     break;
 
-                if ( CommentsFlag != AscCommon.comments_NoComment )
-                    aComm.Add( Y0, Y1, X, X + ItemWidthVisible, 0, 0, 0, 0, { Active : CommentsFlag === AscCommon.comments_ActiveComment ? true : false, CommentId : CommentId } );
+                if ( CommentsFlag != comments_NoComment )
+                    aComm.Add( Y0, Y1, X, X + ItemWidthVisible, 0, 0, 0, 0, { Active : CommentsFlag === comments_ActiveComment ? true : false, CommentId : CommentId } );
                 else if ( highlight_None != HighLight )
                     aHigh.Add( Y0, Y1, X, X + ItemWidthVisible, 0, HighLight.r, HighLight.g, HighLight.b, undefined, HighLight );
 
@@ -4279,8 +4279,8 @@ ParaRun.prototype.Draw_HighLights = function(PDSH)
                 // Пробелы в конце строки (и строку состоящую из пробелов) не подчеркиваем, не зачеркиваем и не выделяем
                 if ( PDSH.Spaces > 0 )
                 {
-                    if ( CommentsFlag != AscCommon.comments_NoComment )
-                        aComm.Add( Y0, Y1, X, X + ItemWidthVisible, 0, 0, 0, 0, { Active : CommentsFlag === AscCommon.comments_ActiveComment ? true : false, CommentId : CommentId } );
+                    if ( CommentsFlag != comments_NoComment )
+                        aComm.Add( Y0, Y1, X, X + ItemWidthVisible, 0, 0, 0, 0, { Active : CommentsFlag === comments_ActiveComment ? true : false, CommentId : CommentId } );
                     else if ( highlight_None != HighLight )
                         aHigh.Add( Y0, Y1, X, X + ItemWidthVisible, 0, HighLight.r, HighLight.g, HighLight.b, undefined, HighLight );