Skip to content

S
sdkjs
Commit cc09e40e authored by Alexander.Trofimov's avatar Alexander.Trofimov
Browse files
Options

Revert "move paragraph to common" 

This reverts commit 22066ff0.
parent fbe062fe
Hide whitespace changes
Inline Side-by-side
Showing with 15151 additions and 15175 deletions
build/configs/webexcel.json
View file @ cc09e40e
......@@ -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
View file @ cc09e40e
......@@ -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
View file @ cc09e40e
......@@ -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
View file @ cc09e40e
......@@ -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
View file @ cc09e40e
......@@ -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
View file @ cc09e40e
......@@ -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
View file @ cc09e40e
......@@ -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
View file @ cc09e40e
This source diff could not be displayed because it is too large. You can view the blob instead.
word/Editor/Run.js
View file @ cc09e40e
......@@ -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 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7