Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE] Use new methods for review display

Browse source
This commit is contained in:
Julia Radzhabova 2021-08-10 19:32:12 +03:00
parent 2954b9ded5
commit a9c32f368e
2 changed files with 48 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
apps/common/main/lib/controller/ReviewChanges.js
View file

@ -131,8 +131,7 @@ define([
this.api.asc_registerCallback('asc_onUpdateRevisionsChangesPosition', _.bind(this.onApiUpdateChangePosition, this));
this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this));
this.api.asc_registerCallback('asc_onParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this));
this.api.asc_registerCallback('asc_onBeginViewModeInReview', _.bind(this.onBeginViewModeInReview, this));
this.api.asc_registerCallback('asc_onEndViewModeInReview', _.bind(this.onEndViewModeInReview, this));
this.api.asc_registerCallback('asc_onChangeDisplayModeInReview', _.bind(this.onChangeDisplayModeInReview, this));
}
if (this.appConfig.canReview)
this.api.asc_registerCallback('asc_onOnTrackRevisionsChange', _.bind(this.onApiTrackRevisionsChange, this));
@ -688,27 +687,40 @@ define([
turnDisplayMode: function(mode) {
if (this.api) {
if (mode === 'final')
this.api.asc_BeginViewModeInReview(true);
else if (mode === 'original')
this.api.asc_BeginViewModeInReview(false);
else
this.api.asc_EndViewModeInReview(mode=='simple');
var type = Asc.c_oAscDisplayModeInReview.Edit;
switch (mode) {
case 'final':
type = Asc.c_oAscDisplayModeInReview.Final;
break;
case 'original':
type = Asc.c_oAscDisplayModeInReview.Original;
break;
case 'simple':
type = Asc.c_oAscDisplayModeInReview.Simple;
break;
}
this.api.asc_SetDisplayModeInReview(type);
}
this.disableEditing(mode == 'final' || mode == 'original');
this._state.previewMode = (mode == 'final' || mode == 'original');
},
onBeginViewModeInReview: function(mode) {
this.disableEditing(true);
this.view && this.view.turnDisplayMode(mode ? 'final' : 'original');
this._state.previewMode = true;
},
onEndViewModeInReview: function(mode) {
this.disableEditing(false);
this.view && this.view.turnDisplayMode(mode ? 'simple' : 'markup');
this._state.previewMode = false;
onChangeDisplayModeInReview: function(type) {
this.disableEditing(type===Asc.c_oAscDisplayModeInReview.Final || type===Asc.c_oAscDisplayModeInReview.Original);
var mode = 'markup';
switch (type) {
case Asc.c_oAscDisplayModeInReview.Final:
mode = 'final';
break;
case Asc.c_oAscDisplayModeInReview.Original:
mode = 'original';
break;
case Asc.c_oAscDisplayModeInReview.Simple:
mode = 'simple';
break;
}
this.view && this.view.turnDisplayMode(mode);
this._state.previewMode = (type===Asc.c_oAscDisplayModeInReview.Final || type===Asc.c_oAscDisplayModeInReview.Original);
},
isPreviewChangesMode: function() {

31
apps/common/mobile/lib/controller/collaboration/Review.jsx
View file

@ -31,14 +31,16 @@ class InitReview extends Component {
if (viewReviewMode === null)
viewReviewMode = appOptions.customization && /^(original|final|markup|simple)$/i.test(appOptions.customization.reviewDisplay) ? appOptions.customization.reviewDisplay.toLocaleLowerCase() : ( appOptions.isEdit || appOptions.isRestrictedEdit ? 'markup' : 'original');
let displayMode = viewReviewMode.toLocaleLowerCase();
if (displayMode === 'final') {
api.asc_BeginViewModeInReview(true);
} else if (displayMode === 'original') {
api.asc_BeginViewModeInReview(false);
} else {
(displayMode === 'simple') && (displayMode = 'markup');
api.asc_EndViewModeInReview();
let type = Asc.c_oAscDisplayModeInReview.Edit;
switch (displayMode) {
case 'final':
type = Asc.c_oAscDisplayModeInReview.Final;
break;
case 'original':
type = Asc.c_oAscDisplayModeInReview.Original;
break;
}
api.asc_SetDisplayModeInReview(type);
props.storeReview.changeDisplayMode(displayMode);
}
});
@ -95,13 +97,16 @@ class Review extends Component {
onDisplayMode (mode) {
const api = Common.EditorApi.get();
if (mode === 'final') {
api.asc_BeginViewModeInReview(true);
} else if (mode === 'original') {
api.asc_BeginViewModeInReview(false);
} else {
api.asc_EndViewModeInReview();
let type = Asc.c_oAscDisplayModeInReview.Edit;
switch (mode) {
case 'final':
type = Asc.c_oAscDisplayModeInReview.Final;
break;
case 'original':
type = Asc.c_oAscDisplayModeInReview.Original;
break;
}
api.asc_SetDisplayModeInReview(type);
!this.appConfig.isEdit && !this.appConfig.isRestrictedEdit && LocalStorage.setItem("de-view-review-mode", mode);
this.props.storeReview.changeDisplayMode(mode);
}