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

Add parameter customization->mentionShare: change hint for mention in comment

Browse source
This commit is contained in:
Julia Radzhabova 2019-12-23 15:51:00 +03:00
parent 36b19cf3d0
commit eb9da5251b
9 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/api/documents/api.js
View file

@ -132,7 +132,8 @@
reviewDisplay: 'original',
spellcheck: true,
compatibleFeatures: false,
unit: 'cm' // cm, pt, inch
unit: 'cm' // cm, pt, inch,
mentionShare : true // customize tooltip for mention
},
plugins: {
autostart: ['asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}'],

3
apps/common/main/lib/controller/Comments.js
View file

@ -1142,7 +1142,8 @@ define([
commentsStore : this.popoverComments,
renderTo : this.sdkViewName,
canRequestUsers: (this.mode) ? this.mode.canRequestUsers : undefined,
canRequestSendNotify: (this.mode) ? this.mode.canRequestSendNotify : undefined
canRequestSendNotify: (this.mode) ? this.mode.canRequestSendNotify : undefined,
mentionShare: (this.mode) ? this.mode.mentionShare : true
});
this.popover.setCommentsStore(this.popoverComments);
}

6
apps/common/main/lib/view/ReviewPopover.js
View file

@ -102,6 +102,7 @@ define([
this.reviewStore = options.reviewStore;
this.canRequestUsers = options.canRequestUsers;
this.canRequestSendNotify = options.canRequestSendNotify;
this.mentionShare = options.mentionShare;
this.externalUsers = [];
this._state = {commentsVisible: false, reviewVisible: false};
@ -244,7 +245,7 @@ define([
textReply: me.textReply,
textClose: me.textClose,
maxCommLength: Asc.c_oAscMaxCellOrCommentLength,
textMention: me.canRequestSendNotify ? me.textMention : ''
textMention: me.canRequestSendNotify ? (me.mentionShare ? me.textMention : me.textMentionNotify) : ''
})
)
});
@ -1184,6 +1185,7 @@ define([
textResolve : 'Resolve',
textOpenAgain : "Open Again",
textFollowMove : 'Follow Move',
textMention : '+mention will provide access to the document and send an email'
textMention : '+mention will provide access to the document and send an email',
textMentionNotify : '+mention will notify the user via email'
}, Common.Views.ReviewPopover || {}))
});

1
apps/documenteditor/main/app/controller/Main.js
View file

@ -358,6 +358,7 @@ define([
this.appOptions.canRequestSharingSettings = this.editorConfig.canRequestSharingSettings;
this.appOptions.compatibleFeatures = (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compatibleFeatures;
this.appOptions.canFeatureComparison = !!this.api.asc_isSupportFeature("comparison");
this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false));
appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header');
appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '')

1
apps/documenteditor/main/locale/en.json
View file

@ -326,6 +326,7 @@
"Common.Views.ReviewPopover.textEdit": "OK",
"Common.Views.ReviewPopover.textFollowMove": "Follow Move",
"Common.Views.ReviewPopover.textMention": "+mention will provide access to the document and send an email",
"Common.Views.ReviewPopover.textMentionNotify": "+mention will notify the user via email",
"Common.Views.ReviewPopover.textOpenAgain": "Open Again",
"Common.Views.ReviewPopover.textReply": "Reply",
"Common.Views.ReviewPopover.textResolve": "Resolve",

1
apps/presentationeditor/main/app/controller/Main.js
View file

@ -322,6 +322,7 @@ define([
this.appOptions.canRequestInsertImage = this.editorConfig.canRequestInsertImage;
this.appOptions.compatibleFeatures = (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compatibleFeatures;
this.appOptions.canRequestSharingSettings = this.editorConfig.canRequestSharingSettings;
this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false));
appHeader = this.getApplication().getController('Viewport').getView('Common.Views.Header');
appHeader.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '')

1
apps/presentationeditor/main/locale/en.json
View file

@ -208,6 +208,7 @@
"Common.Views.ReviewPopover.textClose": "Close",
"Common.Views.ReviewPopover.textEdit": "OK",
"Common.Views.ReviewPopover.textMention": "+mention will provide access to the document and send an email",
"Common.Views.ReviewPopover.textMentionNotify": "+mention will notify the user via email",
"Common.Views.ReviewPopover.textOpenAgain": "Open Again",
"Common.Views.ReviewPopover.textReply": "Reply",
"Common.Views.ReviewPopover.textResolve": "Resolve",

1
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -340,6 +340,7 @@ define([
this.appOptions.canRequestInsertImage = this.editorConfig.canRequestInsertImage;
this.appOptions.compatibleFeatures = (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compatibleFeatures;
this.appOptions.canRequestSharingSettings = this.editorConfig.canRequestSharingSettings;
this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false));
this.headerView = this.getApplication().getController('Viewport').getView('Common.Views.Header');
this.headerView.setCanBack(this.appOptions.canBackToFolder === true, (this.appOptions.canBackToFolder) ? this.editorConfig.customization.goback.text : '')

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -206,6 +206,7 @@
"Common.Views.ReviewPopover.textClose": "Close",
"Common.Views.ReviewPopover.textEdit": "OK",
"Common.Views.ReviewPopover.textMention": "+mention will provide access to the document and send an email",
"Common.Views.ReviewPopover.textMentionNotify": "+mention will notify the user via email",
"Common.Views.ReviewPopover.textOpenAgain": "Open Again",
"Common.Views.ReviewPopover.textReply": "Reply",
"Common.Views.ReviewPopover.textResolve": "Resolve",