pengjunjie/sdkjs
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs.git synced 2026-04-07 14:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #42117

Browse Source 
Fixed the problem with accepting / rejecting selected content when moved text gets into selection
This commit is contained in:
Ilya Kirillov
2019-08-29 12:53:56 +03:00
parent 827a6b7dbc
commit aa54f27364
1 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
word/Private/TrackRevisions.js
View File

@ -551,65 +551,95 @@ CDocument.prototype.RejectRevisionChange = function(oChange)
};
CDocument.prototype.AcceptRevisionChangesBySelection = function()
{
var CurrentChange = this.TrackRevisionsManager.Get_CurrentChange();
if (null !== CurrentChange)
var CurrentChange = this.TrackRevisionsManager.Get_CurrentChange();
if (null !== CurrentChange)
{
this.AcceptRevisionChange(CurrentChange);
}
else
{
var SelectedParagraphs = this.GetAllParagraphs({Selected : true});
var RelatedParas = this.TrackRevisionsManager.Get_AllChangesRelatedParagraphsBySelectedParagraphs(SelectedParagraphs, true);
if (false === this.Document_Is_SelectionLocked(AscCommon.changestype_None, { Type : changestype_2_ElementsArray_and_Type, Elements : RelatedParas, CheckType : AscCommon.changestype_Paragraph_Content}))
{
this.StartAction(AscDFH.historydescription_Document_AcceptRevisionChangesBySelection);
else
{
var sMoveId = this.private_CheckTrackMoveSelection();
if (sMoveId)
{
var oChange = this.TrackRevisionsManager.GetMoveMarkChange(sMoveId, true, false);
if (oChange)
{
oChange = this.TrackRevisionsManager.CollectMoveChange(oChange);
return this.AcceptRevisionChange(oChange);
}
}
var SelectedParagraphs = this.GetAllParagraphs({Selected : true});
var RelatedParas = this.TrackRevisionsManager.Get_AllChangesRelatedParagraphsBySelectedParagraphs(SelectedParagraphs, true);
if (false === this.Document_Is_SelectionLocked(AscCommon.changestype_None, {
Type : changestype_2_ElementsArray_and_Type,
Elements : RelatedParas,
CheckType : AscCommon.changestype_Paragraph_Content
}))
{
this.StartAction(AscDFH.historydescription_Document_AcceptRevisionChangesBySelection);
var isTrackRevision = this.IsTrackRevisions();
if (isTrackRevision)
this.SetTrackRevisions(false);
this.AcceptRevisionChanges(undefined, false);
this.AcceptRevisionChanges(undefined, false);
if (isTrackRevision)
this.SetTrackRevisions(isTrackRevision);
this.FinalizeAction();
}
}
this.FinalizeAction();
}
}
this.TrackRevisionsManager.ClearCurrentChange();
this.GetNextRevisionChange();
this.TrackRevisionsManager.ClearCurrentChange();
this.GetNextRevisionChange();
};
CDocument.prototype.RejectRevisionChangesBySelection = function()
{
var CurrentChange = this.TrackRevisionsManager.Get_CurrentChange();
if (null !== CurrentChange)
var CurrentChange = this.TrackRevisionsManager.Get_CurrentChange();
if (null !== CurrentChange)
{
this.RejectRevisionChange(CurrentChange);
}
else
{
var SelectedParagraphs = this.GetAllParagraphs({Selected : true});
var RelatedParas = this.TrackRevisionsManager.Get_AllChangesRelatedParagraphsBySelectedParagraphs(SelectedParagraphs, false);
if (false === this.Document_Is_SelectionLocked(AscCommon.changestype_None, { Type : changestype_2_ElementsArray_and_Type, Elements : RelatedParas, CheckType : AscCommon.changestype_Paragraph_Content}))
{
this.StartAction(AscDFH.historydescription_Document_AcceptRevisionChangesBySelection);
else
{
var sMoveId = this.private_CheckTrackMoveSelection();
if (sMoveId)
{
var oChange = this.TrackRevisionsManager.GetMoveMarkChange(sMoveId, true, false);
if (oChange)
{
oChange = this.TrackRevisionsManager.CollectMoveChange(oChange);
return this.RejectRevisionChange(oChange);
}
}
var SelectedParagraphs = this.GetAllParagraphs({Selected : true});
var RelatedParas = this.TrackRevisionsManager.Get_AllChangesRelatedParagraphsBySelectedParagraphs(SelectedParagraphs, false);
if (false === this.Document_Is_SelectionLocked(AscCommon.changestype_None, {
Type : changestype_2_ElementsArray_and_Type,
Elements : RelatedParas,
CheckType : AscCommon.changestype_Paragraph_Content
}))
{
this.StartAction(AscDFH.historydescription_Document_AcceptRevisionChangesBySelection);
var isTrackRevision = this.IsTrackRevisions();
if (isTrackRevision)
this.SetTrackRevisions(false);
this.RejectRevisionChanges(undefined, false);
this.RejectRevisionChanges(undefined, false);
if (isTrackRevision)
this.SetTrackRevisions(isTrackRevision);
this.FinalizeAction();
}
}
this.FinalizeAction();
}
}
this.TrackRevisionsManager.ClearCurrentChange();
this.GetNextRevisionChange();
this.GetNextRevisionChange();
};
CDocument.prototype.AcceptAllRevisionChanges = function(isSkipCheckLock, isCheckEmptyAction)
{