diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 710aee5bb..5c113bf44 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -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}'], diff --git a/apps/common/main/lib/controller/Comments.js b/apps/common/main/lib/controller/Comments.js index 974506467..20186655f 100644 --- a/apps/common/main/lib/controller/Comments.js +++ b/apps/common/main/lib/controller/Comments.js @@ -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); } diff --git a/apps/common/main/lib/view/ReviewPopover.js b/apps/common/main/lib/view/ReviewPopover.js index aba4efc0b..723632817 100644 --- a/apps/common/main/lib/view/ReviewPopover.js +++ b/apps/common/main/lib/view/ReviewPopover.js @@ -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 || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 45873fd59..553cf7f7d 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -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 : '') diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 2cee0d50a..329c02ff6 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -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", diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 7487b620a..570465fe6 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -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 : '') diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 43b3df745..8c51789f3 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -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", diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 773560c63..f6b47f922 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -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 : '') diff --git a/apps/spreadsheeteditor/main/locale/en.json b/apps/spreadsheeteditor/main/locale/en.json index 58e9a0fb9..0a0db1d18 100644 --- a/apps/spreadsheeteditor/main/locale/en.json +++ b/apps/spreadsheeteditor/main/locale/en.json @@ -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",