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

Wopi: change config parameters and post messages

Browse source
This commit is contained in:
Julia Radzhabova 2021-05-13 00:57:01 +03:00
parent f8ee00314a
commit 59c658ecab
2 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/api/wopi/editor-wopi.ejs
View file

@ -68,6 +68,7 @@ div {
var documentChanged;
var sendNotificationTimer;
var sessionId;
var fileInfo;
var innerAlert = function (message) {
if (console && console.log)
@ -165,15 +166,24 @@ div {
};
var onRequestClose = function () {
if (fileInfo.ClosePostMessage)
_postMessage('UI_Close', {});
else if (fileInfo.CloseUrl)
window.parent.location.href = fileInfo.CloseUrl;
};
var onRequestEditRights = function () {
if (fileInfo.EditModePostMessage)
_postMessage('UI_Edit', {});
else if (fileInfo.HostEditUrl)
window.open(fileInfo.HostEditUrl, "_blank");
};
var requestSharingSettings = function (event) {
if (fileInfo.FileSharingPostMessage)
_postMessage('UI_Sharing', {});
else if (fileInfo.FileSharingUrl)
window.open(fileInfo.FileSharingUrl, "_blank");
};
var onError = function (event) {
@ -183,8 +193,9 @@ div {
var connectEditor = function () {
fileInfo = <%- JSON.stringify(fileInfo) %>;
var key = "<%- key %>";
var fileInfo = <%- JSON.stringify(fileInfo) %>;
var userAuth = <%- JSON.stringify(userAuth) %>;
var token = "<%- token %>";
var queryParams = <%- JSON.stringify(queryParams) %>;
@ -208,7 +219,7 @@ div {
"edit": !fileInfo.ReadOnly && fileInfo.UserCanWrite,
"review": (fileInfo.SupportsReviewing===false) ? false : (fileInfo.UserCanReview===false ? false : fileInfo.UserCanReview),
"copy": fileInfo.CopyPasteRestrictions!=="CurrentDocumentOnly" && fileInfo.CopyPasteRestrictions!=="BlockAll",
"print": !fileInfo.DisablePrint
"print": !fileInfo.DisablePrint && !fileInfo.HidePrintOption
}
},
"editorConfig": {
@ -216,7 +227,6 @@ div {
"lang": queryParams.lang || queryParams.ui || "en-US",
"region": queryParams.rs,
"callbackUrl": JSON.stringify(userAuth),
"sharingSettingsUrl": fileInfo.FileSharingUrl,
"user": {
"id": fileInfo.UserId,
"name": fileInfo.IsAnonymousUser ? "" : fileInfo.UserFriendlyName
@ -244,11 +254,11 @@ div {
"events": {
"onAppReady": onAppReady,
"onDocumentStateChange": fileInfo.EditNotificationPostMessage ? onDocumentStateChange : undefined,
'onRequestEditRights': fileInfo.EditModePostMessage ? onRequestEditRights : undefined,
'onRequestEditRights': fileInfo.EditModePostMessage || fileInfo.HostEditUrl ? onRequestEditRights : undefined,
"onError": onError,
"onRequestClose": fileInfo.ClosePostMessage ? onRequestClose : undefined,
"onRequestClose": fileInfo.ClosePostMessage || fileInfo.CloseUrl ? onRequestClose : undefined,
"onRequestRename": fileInfo.SupportsRename && fileInfo.UserCanRename ? onRequestRename : undefined,
"onRequestSharingSettings": fileInfo.FileSharingPostMessage ? requestSharingSettings : undefined
"onRequestSharingSettings": fileInfo.FileSharingPostMessage || fileInfo.FileSharingUrl ? requestSharingSettings : undefined
}
};

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

@ -904,9 +904,6 @@ define([
if (this.appConfig.canRequestSharingSettings) {
Common.Gateway.requestSharingSettings();
} else {
if (this.appConfig.wopi) {
window.open(this.appConfig.sharingSettingsUrl, "_blank");
} else {
var me = this;
me._docAccessDlg = new Common.Views.DocumentAccessDialog({
@ -920,7 +917,6 @@ define([
me._docAccessDlg.show();
}
}
},
setSharingSettings: function(data) {