From f17c824f1ed62922c2cdd1710cdad6526e620911 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 3 Jun 2022 18:59:19 +0300 Subject: [PATCH 1/3] [PE] Fix Bug 57473 (#1780) --- apps/presentationeditor/main/locale/ru.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/presentationeditor/main/locale/ru.json b/apps/presentationeditor/main/locale/ru.json index c87e6efdf..9803e1757 100644 --- a/apps/presentationeditor/main/locale/ru.json +++ b/apps/presentationeditor/main/locale/ru.json @@ -114,7 +114,7 @@ "Common.define.effectData.textFloatIn": "Плавное приближение", "Common.define.effectData.textFloatOut": "Плавное удаление", "Common.define.effectData.textFloatUp": "Плавное перемещение вверх", - "Common.define.effectData.textFlyIn": "Влет", + "Common.define.effectData.textFlyIn": "Вылет", "Common.define.effectData.textFlyOut": "Вылет за край листа", "Common.define.effectData.textFontColor": "Цвет шрифта", "Common.define.effectData.textFootball": "Овал", From a0be79bdee3bc5dcdef3fd0c5c27a2bd036d3f0b Mon Sep 17 00:00:00 2001 From: JuliaSvinareva <49390479+JuliaSvinareva@users.noreply.github.com> Date: Tue, 7 Jun 2022 10:27:50 +0300 Subject: [PATCH 2/3] [SSE] Bug 57488 (#1786) --- apps/spreadsheeteditor/main/app/controller/Main.js | 2 +- apps/spreadsheeteditor/main/app/controller/Print.js | 7 +++++++ apps/spreadsheeteditor/main/app/view/FileMenuPanels.js | 9 ++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index ff03322fe..2d970bec7 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1387,7 +1387,7 @@ define([ this.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(this.onDocumentModifiedChanged, this)); var printController = app.getController('Print'); - printController && this.api && printController.setApi(this.api); + printController && this.api && printController.setApi(this.api).setMode(this.appOptions); } diff --git a/apps/spreadsheeteditor/main/app/controller/Print.js b/apps/spreadsheeteditor/main/app/controller/Print.js index 4bbaaedf4..d2a21bd82 100644 --- a/apps/spreadsheeteditor/main/app/controller/Print.js +++ b/apps/spreadsheeteditor/main/app/controller/Print.js @@ -119,12 +119,19 @@ define([ this.printSettings.$previewBox.on(eventname, _.bind(this.onPreviewWheel, this)); }, + setMode: function (mode) { + this.mode = mode; + this.printSettings && this.printSettings.setMode(mode); + }, + setApi: function(o) { this.api = o; this.api.asc_registerCallback('asc_onSheetsChanged', _.bind(this.updateSheetsInfo, this)); this.api.asc_registerCallback('asc_onPrintPreviewSheetChanged', _.bind(this.onApiChangePreviewSheet, this)); this.api.asc_registerCallback('asc_onPrintPreviewPageChanged', _.bind(this.onApiChangePreviewPage, this)); this.api.asc_registerCallback('asc_onPrintPreviewSheetDataChanged', _.bind(this.onApiPreviewSheetDataChanged, this)); + + return this; }, updateSheetsInfo: function() { diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 67626ca3f..d3c755a61 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -2317,7 +2317,7 @@ define([ '', '', '', - '', + '', //'', '', '
', @@ -2648,8 +2648,11 @@ define([ this.$el = $(node).html($markup); - this.$el.on('click', '#print-header-footer-settings', _.bind(this.openHeaderSettings, this)); - this.$headerSettings = $('#print-header-footer-settings'); + if (!this.mode.isEdit) { + $markup.find('.header-settings').hide(); + } else { + this.$el.on('click', '#print-header-footer-settings', _.bind(this.openHeaderSettings, this)); + } this.$previewBox = $('#print-preview-box'); this.$previewEmpty = $('#print-preview-empty'); From 03afbac58f8f077031fb3afd0417c8aa72460594 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 7 Jun 2022 23:51:27 +0300 Subject: [PATCH 3/3] [DE mobile] Fix Bug 57487 (#1787) --- apps/documenteditor/mobile/src/store/appOptions.js | 1 + apps/documenteditor/mobile/src/view/settings/Download.jsx | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/mobile/src/store/appOptions.js b/apps/documenteditor/mobile/src/store/appOptions.js index 29fba4077..a156c6560 100644 --- a/apps/documenteditor/mobile/src/store/appOptions.js +++ b/apps/documenteditor/mobile/src/store/appOptions.js @@ -86,6 +86,7 @@ export class storeAppOptions { && (!!(config.customization.goback.url) || config.customization.goback.requestClose && this.canRequestClose); this.canBack = this.canBackToFolder === true; this.canPlugins = false; + this.canFeatureForms = !!Common.EditorApi.get().asc_isSupportFeature("forms"); AscCommon.UserInfoParser.setParser(true); AscCommon.UserInfoParser.setCurrentName(this.user.fullname); diff --git a/apps/documenteditor/mobile/src/view/settings/Download.jsx b/apps/documenteditor/mobile/src/view/settings/Download.jsx index 4e822fd2e..f2e82d717 100644 --- a/apps/documenteditor/mobile/src/view/settings/Download.jsx +++ b/apps/documenteditor/mobile/src/view/settings/Download.jsx @@ -8,6 +8,7 @@ const Download = props => { const _t = t("Settings", { returnObjects: true }); const storeDocumentInfo = props.storeDocumentInfo; const dataDoc = storeDocumentInfo.dataDoc; + const canFeatureForms = props.storeAppOptions.canFeatureForms; return ( @@ -17,7 +18,7 @@ const Download = props => { props.onSaveFormat(Asc.c_oAscFileType.DOCX)}> - {dataDoc.fileType === 'docxf' || dataDoc.fileType === 'docx' ? [ + {canFeatureForms && (dataDoc.fileType === 'docxf' || dataDoc.fileType === 'docx') ? [ props.onSaveFormat(Asc.c_oAscFileType.DOCXF)}> , @@ -58,4 +59,4 @@ const Download = props => { ) } -export default inject('storeDocumentInfo')(observer(Download)); \ No newline at end of file +export default inject('storeDocumentInfo', 'storeAppOptions')(observer(Download)); \ No newline at end of file