pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'fix/pdf-bugs' (#704) from fix/pdf-bugs into release/v9.1.0

Browse Source
This commit is contained in:
Julia Radzhabova
2025-09-19 14:01:18 +00:00
parent 5c262a0cce 99b1586071
commit f66440d3ed
7 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/pdfeditor/main/app.js
View File

@ -151,6 +151,7 @@ require([
'Common.Controllers.Comments',
'Common.Controllers.Draw',
'Common.Controllers.Plugins',
'Common.Controllers.ExternalLinks',
'Common.Controllers.ExternalDiagramEditor',
// 'Common.Controllers.ExternalOleEditor',
'Common.Controllers.Protection'
@ -187,6 +188,7 @@ require([
'common/main/lib/controller/Comments',
'common/main/lib/controller/Chat',
/** coauthoring end **/
'common/main/lib/controller/ExternalLinks',
'common/main/lib/controller/Plugins',
'common/main/lib/controller/ExternalDiagramEditor',
// 'common/main/lib/controller/ExternalOleEditor',

3
apps/pdfeditor/main/app/controller/Main.js
View File

@ -403,6 +403,9 @@ define([
this.appOptions.canRequestSaveAs = this.editorConfig.canRequestSaveAs;
this.appOptions.canRequestInsertImage = this.editorConfig.canRequestInsertImage;
this.appOptions.canRequestSharingSettings = this.editorConfig.canRequestSharingSettings;
this.appOptions.canRequestOpen = this.editorConfig.canRequestOpen;
this.appOptions.canRequestReferenceSource = this.editorConfig.canRequestReferenceSource;
this.appOptions.canRequestReferenceData = this.editorConfig.canRequestReferenceData;
this.appOptions.compatibleFeatures = true;
this.appOptions.mentionShare = !((typeof (this.appOptions.customization) == 'object') && (this.appOptions.customization.mentionShare==false));
this.appOptions.canSaveDocumentToBinary = this.editorConfig.canSaveDocumentToBinary;

2
apps/pdfeditor/main/app/controller/Toolbar.js
View File

@ -1552,7 +1552,7 @@ define([
Array.prototype.push.apply(me.toolbar.lockControls, drawtab.getView().getButtons());
Array.prototype.push.apply(me.toolbar.paragraphControls, drawtab.getView().getButtons());
}
me.getApplication().getController('Common.Controllers.ExternalLinks').setConfig({toolbar: me}).setApi(me.api);
!config.canComments && me.toolbar.setVisible('comment', false);
}

1
apps/pdfeditor/main/app/view/RightMenu.js
View File

@ -255,6 +255,7 @@ define([
this.imageSettings && this.imageSettings.setMode(mode);
this.shapeSettings && this.shapeSettings.setMode(mode);
this.formSettings && this.formSettings.setMode(mode);
this.chartSettings && this.chartSettings.setMode(mode);
},
onBtnMenuClick: function(btn, e) {

3
apps/pdfeditor/main/app_dev.js
View File

@ -140,6 +140,7 @@ require([
,'Common.Controllers.Chat'
,'Common.Controllers.Comments'
,'Common.Controllers.Draw'
,'Common.Controllers.ExternalLinks'
,'Common.Controllers.Plugins'
,'Common.Controllers.ExternalDiagramEditor'
// ,'Common.Controllers.ExternalOleEditor'
@ -178,6 +179,7 @@ require([
,'common/main/lib/controller/Chat'
,'common/main/lib/controller/Plugins'
,'common/main/lib/controller/ExternalDiagramEditor'
,'common/main/lib/controller/ExternalLinks'
// ,'common/main/lib/controller/ExternalOleEditor'
,'common/main/lib/controller/Draw'
,'common/main/lib/controller/Protection'
@ -205,6 +207,7 @@ require([
'common/main/lib/view/DocumentHolderExt',
'common/main/lib/util/define',
'common/main/lib/view/ListSettingsDialog',
'common/main/lib/view/ExternalLinksDlg',
'common/main/lib/view/CustomizeQuickAccessDialog',
'common/main/lib/view/PasswordDialog',
'common/main/lib/component/TextareaField',

1
apps/pdfeditor/main/app_pack.js
View File

@ -21,6 +21,7 @@ require([
'common/main/lib/view/TextInputDialog',
'common/main/lib/view/DocumentHolderExt',
'common/main/lib/view/ListSettingsDialog',
'common/main/lib/view/ExternalLinksDlg',
'common/main/lib/view/CustomizeQuickAccessDialog',
'common/main/lib/view/PasswordDialog',
'common/main/lib/component/TextareaField',

21
apps/pdfeditor/main/locale/en.json
View File

@ -10,6 +10,13 @@
"Common.Controllers.Plugins.textPluginSuccessfullyInstalled": "<b>{0}</b> is successfully installed. You can access all background plugins here.",
"Common.Controllers.Plugins.textRunInstalledPlugins": "Run installed plugins",
"Common.Controllers.Plugins.textRunPlugin": "Run plugin",
"Common.Controllers.ExternalLinks.textAddExternalData": "The link to an external source has been added. You can update such links in the Data tab.",
"Common.Controllers.ExternalLinks.textDontUpdate": "Don't Update",
"Common.Controllers.ExternalLinks.textUpdate": "Update",
"Common.Controllers.ExternalLinks.txtErrorExternalLink": "Error: updating is failed",
"Common.Controllers.ExternalLinks.warnUpdateExternalData": "This workbook contains links to one or more external sources that could be unsafe.<br>If you trust the links, update them to get the latest data.",
"Common.Controllers.ExternalLinks.warnUpdateExternalDataDE": "This document contains links to one or more external sources that could be unsafe.<br>If you trust the links, update them to get the latest data.",
"Common.Controllers.ExternalLinks.warnUpdateExternalDataPE": "This presentation contains links to one or more external sources that could be unsafe.<br>If you trust the links, update them to get the latest data.",
"Common.define.smartArt.textAccentedPicture": "Accented picture",
"Common.define.smartArt.textAccentProcess": "Accent process",
"Common.define.smartArt.textAlternatingFlow": "Alternating flow",
@ -422,6 +429,20 @@
"Common.Views.ExternalDiagramEditor.textTitle": "Chart editor",
"Common.Views.ExternalEditor.textClose": "Close",
"Common.Views.ExternalEditor.textSave": "Save & Exit",
"Common.Views.ExternalLinksDlg.closeButtonText": "Close",
"Common.Views.ExternalLinksDlg.textAutoUpdate": "Automatically update data from the linked sources",
"Common.Views.ExternalLinksDlg.textChange": "Change source",
"Common.Views.ExternalLinksDlg.textDelete": "Break links",
"Common.Views.ExternalLinksDlg.textDeleteAll": "Break all links",
"Common.Views.ExternalLinksDlg.textOk": "OK",
"Common.Views.ExternalLinksDlg.textOpen": "Open source",
"Common.Views.ExternalLinksDlg.textSource": "Source",
"Common.Views.ExternalLinksDlg.textStatus": "Status",
"Common.Views.ExternalLinksDlg.textUnknown": "Unknown",
"Common.Views.ExternalLinksDlg.textUpdate": "Update values",
"Common.Views.ExternalLinksDlg.textUpdateAll": "Update all",
"Common.Views.ExternalLinksDlg.textUpdating": "Updating...",
"Common.Views.ExternalLinksDlg.txtTitle": "External links",
"Common.Views.Header.ariaQuickAccessToolbar": "Quick access toolbar",
"Common.Views.Header.labelCoUsersDescr": "Users who are editing the file:",
"Common.Views.Header.textAddFavorite": "Mark as favorite",