pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-24 01:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/v8.1.0' into feature/close-editor

Browse Source
This commit is contained in:
Julia Radzhabova
2024-02-22 17:49:03 +03:00
parent 14c33df9e1 3740ba4cb7
commit 2ad950ffb7
322 changed files with 3178 additions and 2092 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
apps/api/documents/api.js
View File

@ -110,7 +110,8 @@
image: url,
imageDark: url, // logo for dark theme
imageEmbedded: url, // deprecated, use image instead
url: http://...
url: http://...,
visible: true // hide logo if visible=false
},
customer: {
name: 'SuperPuper',
@ -162,11 +163,13 @@
save: false/true // save button
} / false / true,
home: {
mailmerge: false/true // mail merge button
mailmerge: false/true // mail merge button // deprecated, button is moved to collaboration tab. use toolbar->collaboration->mailmerge instead
},
layout: false / true, // layout tab
references: false / true, // de references tab
collaboration: false / true // collaboration tab
collaboration: {
mailmerge: false/true // mail merge button in de
} / false / true, // collaboration tab
draw: false / true // draw tab
protect: false / true, // protect tab
plugins: false / true // plugins tab
@ -209,7 +212,7 @@
compactToolbar: false,
leftMenu: true, // must be deprecated. use layout.leftMenu instead
rightMenu: true, // must be deprecated. use layout.rightMenu instead
hideRightMenu: false, // hide or show right panel on first loading
hideRightMenu: true, // hide or show right panel on first loading !! default value changed in 8.1
toolbar: true, // must be deprecated. use layout.toolbar instead
statusBar: true, // must be deprecated. use layout.statusBar instead
autosave: true,
@ -1018,7 +1021,9 @@
params += "&logo=" + encodeURIComponent(config.editorConfig.customization.loaderLogo);
}
if ( config.editorConfig.customization.logo ) {
if (config.type=='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded))
if (config.editorConfig.customization.logo.visible===false) {
params += "&headerlogo=";
} else if (config.type=='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded))
params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded);
else if (config.type!='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageDark)) {
config.editorConfig.customization.logo.image && (params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image));

7
apps/api/wopi/editor-wopi.ejs
View File

@ -219,6 +219,10 @@ div {
window.open(fileInfo.HostEditUrl, "_blank");
};
var onRequestSaveAs = function (event) {
//SaveAs work via PutRelativeFile server-server request
};
var onRequestSharingSettings = function (event) {
if (fileInfo.FileSharingPostMessage)
_postMessage('UI_Sharing', {});
@ -324,7 +328,8 @@ div {
"events": {
"onAppReady": onAppReady,
"onDocumentStateChange": fileInfo.EditNotificationPostMessage ? onDocumentStateChange : undefined,
'onRequestEditRights': fileInfo.EditModePostMessage || (fileInfo.HostEditUrl && !fileInfo.UserCanNotWriteRelative) ? onRequestEditRights : undefined,
'onRequestEditRights': fileInfo.EditModePostMessage || fileInfo.HostEditUrl ? onRequestEditRights : undefined,
'onRequestSaveAs': fileInfo.SupportsUpdate && !fileInfo.UserCanNotWriteRelative ? onRequestSaveAs : undefined,
"onError": onError,
"onRequestClose": fileInfo.ClosePostMessage || fileInfo.CloseUrl ? onRequestClose : undefined,
"onRequestRename": fileInfo.SupportsRename && fileInfo.UserCanRename ? onRequestRename : undefined,