Commit e97da9d6 authored by Ilya Kirillov's avatar Ilya Kirillov

Function for check whether is it a viewer mode or not were moved to the CDocument class.

parent e228821b
This diff is collapsed.
...@@ -1431,7 +1431,8 @@ Paragraph.prototype.Internal_Draw_2 = function(CurPage, pGraphics, Pr) ...@@ -1431,7 +1431,8 @@ Paragraph.prototype.Internal_Draw_2 = function(CurPage, pGraphics, Pr)
}; };
Paragraph.prototype.Internal_Draw_3 = function(CurPage, pGraphics, Pr) Paragraph.prototype.Internal_Draw_3 = function(CurPage, pGraphics, Pr)
{ {
if (!this.bFromDocument) var LogicDocument = this.LogicDocument;
if (!this.bFromDocument || !LogicDocument)
return; return;
var bDrawBorders = this.Is_NeedDrawBorders(); var bDrawBorders = this.Is_NeedDrawBorders();
...@@ -1442,14 +1443,14 @@ Paragraph.prototype.Internal_Draw_3 = function(CurPage, pGraphics, Pr) ...@@ -1442,14 +1443,14 @@ Paragraph.prototype.Internal_Draw_3 = function(CurPage, pGraphics, Pr)
var _Page = this.Pages[CurPage]; var _Page = this.Pages[CurPage];
var DocumentComments = editor.WordControl.m_oLogicDocument.Comments; var DocumentComments = LogicDocument.Comments;
var Page_abs = this.Get_AbsolutePage(CurPage); var Page_abs = this.Get_AbsolutePage(CurPage);
var DrawComm = ( DocumentComments.Is_Use() && true != editor.isViewMode); var DrawComm = ( DocumentComments.Is_Use() && (true !== LogicDocument.IsViewMode() || true === LogicDocument.CanEditCommentsInViewMode()));
var DrawFind = editor.WordControl.m_oLogicDocument.SearchEngine.Selection; var DrawFind = LogicDocument.SearchEngine.Selection;
var DrawColl = ( undefined === pGraphics.RENDERER_PDF_FLAG ? false : true ); var DrawColl = ( undefined === pGraphics.RENDERER_PDF_FLAG ? false : true );
var DrawMMFields = (this.LogicDocument && true === this.LogicDocument.Is_HightlightMailMergeFields() ? true : false); var DrawMMFields = (this.LogicDocument && true === this.LogicDocument.Is_HightlightMailMergeFields() ? true : false);
var DrawSolvedComments = ( DocumentComments.IsUseSolved() && true != editor.isViewMode); var DrawSolvedComments = ( DocumentComments.IsUseSolved() && (true !== LogicDocument.IsViewMode() || true === LogicDocument.CanEditCommentsInViewMode()));
PDSH.Reset(this, pGraphics, DrawColl, DrawFind, DrawComm, DrawMMFields, this.Get_EndInfoByPage(CurPage - 1), DrawSolvedComments); PDSH.Reset(this, pGraphics, DrawColl, DrawFind, DrawComm, DrawMMFields, this.Get_EndInfoByPage(CurPage - 1), DrawSolvedComments);
...@@ -6030,7 +6031,7 @@ Paragraph.prototype.Selection_SetEnd = function(X, Y, CurPage, MouseEvent, bTabl ...@@ -6030,7 +6031,7 @@ Paragraph.prototype.Selection_SetEnd = function(X, Y, CurPage, MouseEvent, bTabl
{ {
var PagesCount = this.Pages.length; var PagesCount = this.Pages.length;
if (this.bFromDocument && false === editor.isViewMode && null === this.Parent.Is_HdrFtr(true) && null == this.Get_DocumentNext() && CurPage >= PagesCount - 1 && Y > this.Pages[PagesCount - 1].Bounds.Bottom && MouseEvent.ClickCount >= 2) if (this.bFromDocument && this.LogicDocument && false === this.LogicDocument.IsViewMode() && null === this.Parent.Is_HdrFtr(true) && null == this.Get_DocumentNext() && CurPage >= PagesCount - 1 && Y > this.Pages[PagesCount - 1].Bounds.Bottom && MouseEvent.ClickCount >= 2)
return this.Parent.Extend_ToPos(X, Y); return this.Parent.Extend_ToPos(X, Y);
// Обновляем позицию курсора // Обновляем позицию курсора
...@@ -6051,7 +6052,10 @@ Paragraph.prototype.Selection_SetEnd = function(X, Y, CurPage, MouseEvent, bTabl ...@@ -6051,7 +6052,10 @@ Paragraph.prototype.Selection_SetEnd = function(X, Y, CurPage, MouseEvent, bTabl
var LastRange = this.Lines[this.Lines.length - 1].Ranges[this.Lines[this.Lines.length - 1].Ranges.length - 1]; var LastRange = this.Lines[this.Lines.length - 1].Ranges[this.Lines[this.Lines.length - 1].Ranges.length - 1];
if (CurPage >= PagesCount - 1 && X > LastRange.W && MouseEvent.ClickCount >= 2 && Y <= this.Pages[PagesCount - 1].Bounds.Bottom) if (CurPage >= PagesCount - 1 && X > LastRange.W && MouseEvent.ClickCount >= 2 && Y <= this.Pages[PagesCount - 1].Bounds.Bottom)
{ {
if (this.bFromDocument && false === editor.isViewMode && false === editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(AscCommon.changestype_None, { if (this.bFromDocument
&& this.LogicDocument
&& false === this.LogicDocument.IsViewMode()
&& false === this.LogicDocument.Document_Is_SelectionLocked(AscCommon.changestype_None, {
Type : AscCommon.changestype_2_Element_and_Type, Type : AscCommon.changestype_2_Element_and_Type,
Element : this, Element : this,
CheckType : AscCommon.changestype_Paragraph_Content CheckType : AscCommon.changestype_Paragraph_Content
...@@ -6064,14 +6068,16 @@ Paragraph.prototype.Selection_SetEnd = function(X, Y, CurPage, MouseEvent, bTabl ...@@ -6064,14 +6068,16 @@ Paragraph.prototype.Selection_SetEnd = function(X, Y, CurPage, MouseEvent, bTabl
{ {
this.MoveCursorToEndPos(); this.MoveCursorToEndPos();
this.Document_SetThisElementCurrent(true); this.Document_SetThisElementCurrent(true);
editor.WordControl.m_oLogicDocument.Recalculate(); this.LogicDocument.Recalculate();
return; return;
} }
else else
{
History.Remove_LastPoint(); History.Remove_LastPoint();
} }
} }
} }
}
// Выставляем селект // Выставляем селект
this.Set_SelectionContentPos(this.Get_ParaContentPos(true, true), SearchPosXY.Pos); this.Set_SelectionContentPos(this.Get_ParaContentPos(true, true), SearchPosXY.Pos);
......
...@@ -4438,7 +4438,8 @@ CTable.prototype.Selection_SetEnd = function(X, Y, CurPage, MouseEvent) ...@@ -4438,7 +4438,8 @@ CTable.prototype.Selection_SetEnd = function(X, Y, CurPage, MouseEvent)
var Page = this.Pages[CurPage]; var Page = this.Pages[CurPage];
if (this.Selection.Type2 === table_Selection_Border) if (this.Selection.Type2 === table_Selection_Border)
{ {
if (true === editor.isViewMode || this.Selection.Data2.PageNum != CurPage) var LogicDocument = this.LogicDocument;
if (!LogicDocument || true === LogicDocument.IsViewMode() || this.Selection.Data2.PageNum != CurPage)
return; return;
var _X = X; var _X = X;
...@@ -4476,8 +4477,7 @@ CTable.prototype.Selection_SetEnd = function(X, Y, CurPage, MouseEvent) ...@@ -4476,8 +4477,7 @@ CTable.prototype.Selection_SetEnd = function(X, Y, CurPage, MouseEvent)
return; return;
} }
var LogicDocument = (editor && true !== editor.isViewMode ? editor.WordControl.m_oLogicDocument : null); if (false === LogicDocument.Document_Is_SelectionLocked(AscCommon.changestype_None, {
if (LogicDocument && false === LogicDocument.Document_Is_SelectionLocked(AscCommon.changestype_None, {
Type : AscCommon.changestype_2_Element_and_Type, Type : AscCommon.changestype_2_Element_and_Type,
Element : this, Element : this,
CheckType : AscCommon.changestype_Table_Properties CheckType : AscCommon.changestype_Table_Properties
......
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