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 'hotfix/v9.0.4' (#601) from hotfix/v9.0.4 into develop

Browse Source
This commit is contained in:
Julia Radzhabova
2025-08-01 12:33:48 +00:00
parent abe6039862 a3e79769f8
commit bec2e74a73
80 changed files with 196 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/visioeditor/main/app/controller/LeftMenu.js
View File

@ -222,6 +222,7 @@ define([
break;
case 'close-editor': Common.NotificationCenter.trigger('close'); break;
case 'switch:mobile': Common.Gateway.switchEditorType('mobile', true); break;
case 'suggest': Common.NotificationCenter.trigger('suggest'); break;
default: close_menu = false;
}

6
apps/visioeditor/main/app/controller/Main.js
View File

@ -171,6 +171,7 @@ define([
Common.NotificationCenter.on('api:disconnect', _.bind(this.onCoAuthoringDisconnect, this));
Common.NotificationCenter.on('goback', _.bind(this.goBack, this));
Common.NotificationCenter.on('suggest', _.bind(this.onSuggest, this));
Common.NotificationCenter.on('close', _.bind(this.closeEditor, this));
Common.NotificationCenter.on('markfavorite', _.bind(this.markFavorite, this));
Common.NotificationCenter.on('download:advanced', _.bind(this.onAdvancedOptions, this));
@ -649,6 +650,10 @@ define([
}
},
onSuggest: function() {
window.open('{{SUGGEST_URL}}', "_blank");
},
closeEditor: function() {
this.appOptions.canRequestClose && this.onRequestClose();
},
@ -1175,6 +1180,7 @@ define([
this.appOptions.isRestrictedEdit = !this.appOptions.isEdit && this.appOptions.canComments;
this.appOptions.canSaveToFile = this.appOptions.isEdit || this.appOptions.isRestrictedEdit;
this.appOptions.showSaveButton = this.appOptions.isEdit;
this.appOptions.canSuggest = !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.suggestFeature===false);
this.appOptions.compactHeader = this.appOptions.customization && (typeof (this.appOptions.customization) == 'object') && !!this.appOptions.customization.compactHeader;
this.appOptions.twoLevelHeader = this.appOptions.isEdit; // when compactHeader=true some buttons move to toolbar

1
apps/visioeditor/main/app/template/FileMenu.template
View File

@ -17,6 +17,7 @@
<li class="devider"></li>
<li id="fm-btn-settings" class="fm-btn" data-layout-name="toolbar-file-settings"></li>
<li id="fm-btn-help" class="fm-btn"></li>
<li id="fm-btn-suggest" class="fm-btn"></li>
</div>
<div class="panel-context">
<div id="panel-saveas" class="content-box"></div>

17
apps/visioeditor/main/app/view/FileMenu.js
View File

@ -240,6 +240,17 @@ define([
iconCls: 'menu__icon btn-goback'
});
this.miSuggest = new Common.UI.MenuItem({
el : $markup.elementById('#fm-btn-suggest'),
action : 'suggest',
caption : this.btnSuggestCaption,
canFocused: false,
dataHint: 1,
dataHintDirection: 'left-top',
dataHintOffset: [-2, 22],
iconCls: 'menu__icon btn-suggest-feature'
});
this.items = [];
this.items.push(
this.miClose,
@ -254,7 +265,8 @@ define([
this.miAccess,
this.miSettings,
this.miHelp,
this.miBack
this.miBack,
this.miSuggest
);
this.rendered = true;
@ -352,6 +364,9 @@ define([
isVisible = this.mode.canBack;
this.miBack[isVisible ?'show':'hide']();
isVisible = this.mode.canSuggest;
this.miSuggest[isVisible ?'show':'hide']();
if (!this.customizationDone) {
this.customizationDone = true;
this.mode.canBack && this.mode.customization.goback.text && typeof this.mode.customization.goback.text === 'string' && this.miBack.setCaption(this.mode.customization.goback.text);

2
apps/visioeditor/main/app/view/FileMenuPanels.js
View File

@ -1087,6 +1087,8 @@ define([], function () {
value = value ? this.txtYes : this.txtNo;
} else if (type === AscCommon.c_oVariantTypes.vtFiletime) {
value = this.dateToString(new Date(value), true);
} else {
value = Common.Utils.String.htmlEncode(value);
}
return '<tr data-custom-property>' +

1
apps/visioeditor/main/locale/de.json
View File

@ -334,6 +334,7 @@
"VE.Views.FileMenu.btnSaveAsCaption": "Speichern als",
"VE.Views.FileMenu.btnSaveCopyAsCaption": "Kopie speichern als",
"VE.Views.FileMenu.btnSettingsCaption": "Erweiterte Einstellungen",
"VE.Views.FileMenu.btnSuggestCaption": "Eine Funktion vorschlagen",
"VE.Views.FileMenu.btnSwitchToMobileCaption": "In den Mobilmodus wechseln",
"VE.Views.FileMenu.textDownload": "Herunterladen",
"VE.Views.FileMenuPanels.CreateNew.txtBlank": "Leeres Dokument",

1
apps/visioeditor/main/locale/en.json
View File

@ -318,6 +318,7 @@
"VE.Views.DocumentHolder.txtWarnUrl": "Clicking this link can be harmful to your device and data.<br>Are you sure you want to continue?",
"VE.Views.FileMenu.ariaFileMenu": "File menu",
"VE.Views.FileMenu.btnBackCaption": "Open File Location",
"VE.Views.FileMenu.btnSuggestCaption": "Suggest a Feature",
"VE.Views.FileMenu.btnCloseEditor": "Close File",
"VE.Views.FileMenu.btnCloseMenuCaption": "Back",
"VE.Views.FileMenu.btnCreateNewCaption": "Create New",

1
apps/visioeditor/main/locale/es.json
View File

@ -334,6 +334,7 @@
"VE.Views.FileMenu.btnSaveAsCaption": "Guardar como",
"VE.Views.FileMenu.btnSaveCopyAsCaption": "Guardar copia como",
"VE.Views.FileMenu.btnSettingsCaption": "Configuración avanzada",
"VE.Views.FileMenu.btnSuggestCaption": "Sugerir una función",
"VE.Views.FileMenu.btnSwitchToMobileCaption": "Cambiar a móvil",
"VE.Views.FileMenu.textDownload": "Descargar",
"VE.Views.FileMenuPanels.CreateNew.txtBlank": "Documento en blanco",

1
apps/visioeditor/main/locale/fr.json
View File

@ -334,6 +334,7 @@
"VE.Views.FileMenu.btnSaveAsCaption": "Enregistrer sous",
"VE.Views.FileMenu.btnSaveCopyAsCaption": "Enregistrer une copie sous",
"VE.Views.FileMenu.btnSettingsCaption": "Paramètres avancés",
"VE.Views.FileMenu.btnSuggestCaption": "Proposer une fonctionnalité",
"VE.Views.FileMenu.btnSwitchToMobileCaption": "Passer en mode mobile",
"VE.Views.FileMenu.textDownload": "Télécharger",
"VE.Views.FileMenuPanels.CreateNew.txtBlank": "Document vide",

1
apps/visioeditor/main/locale/it.json
View File

@ -334,6 +334,7 @@
"VE.Views.FileMenu.btnSaveAsCaption": "Salva come",
"VE.Views.FileMenu.btnSaveCopyAsCaption": "Salva copia come",
"VE.Views.FileMenu.btnSettingsCaption": "Impostazioni avanzate",
"VE.Views.FileMenu.btnSuggestCaption": "Suggerisci una funzione",
"VE.Views.FileMenu.btnSwitchToMobileCaption": "Passa a mobile",
"VE.Views.FileMenu.textDownload": "Scarica",
"VE.Views.FileMenuPanels.CreateNew.txtBlank": "Documento vuoto",

1
apps/visioeditor/main/locale/ro.json
View File

@ -334,6 +334,7 @@
"VE.Views.FileMenu.btnSaveAsCaption": "Salvare ca",
"VE.Views.FileMenu.btnSaveCopyAsCaption": "Salvare copie ca",
"VE.Views.FileMenu.btnSettingsCaption": "Setări avansate",
"VE.Views.FileMenu.btnSuggestCaption": "Sugerează o funcție",
"VE.Views.FileMenu.btnSwitchToMobileCaption": "Comutare la modul Mobil",
"VE.Views.FileMenu.textDownload": "Descărcare",
"VE.Views.FileMenuPanels.CreateNew.txtBlank": "Document necompletat",

1
apps/visioeditor/main/locale/ru.json
View File

@ -334,6 +334,7 @@
"VE.Views.FileMenu.btnSaveAsCaption": "Сохранить как",
"VE.Views.FileMenu.btnSaveCopyAsCaption": "Сохранить копию как",
"VE.Views.FileMenu.btnSettingsCaption": "Дополнительные параметры",
"VE.Views.FileMenu.btnSuggestCaption": "Предложить функцию",
"VE.Views.FileMenu.btnSwitchToMobileCaption": "Переключиться в мобильный режим",
"VE.Views.FileMenu.textDownload": "Скачать",
"VE.Views.FileMenuPanels.CreateNew.txtBlank": "Пустой документ",