From 8e6a052ff3e7ad4e7fb077d4a5ae85bd49daaa47 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 22 Oct 2024 12:22:09 +0300 Subject: [PATCH 1/3] [PDF] Set focus to document after saving --- apps/pdfeditor/main/app/controller/Toolbar.js | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/pdfeditor/main/app/controller/Toolbar.js b/apps/pdfeditor/main/app/controller/Toolbar.js index 24c36fee5e..3c8130c486 100644 --- a/apps/pdfeditor/main/app/controller/Toolbar.js +++ b/apps/pdfeditor/main/app/controller/Toolbar.js @@ -723,6 +723,7 @@ define([ Common.component.Analytics.trackEvent('Save'); Common.component.Analytics.trackEvent('ToolBar', 'Save'); Common.UI.TooltipManager.closeTip('pdfSave'); + Common.NotificationCenter.trigger('edit:complete', toolbar); } }, From ce5ab7abcd8dc0e8fbc6726882a6bb252f819e9e Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 22 Oct 2024 15:42:35 +0300 Subject: [PATCH 2/3] [Mobile] Handle imageLight parameter for header logo --- apps/documenteditor/mobile/src/page/main.jsx | 4 ++-- apps/presentationeditor/mobile/src/page/main.jsx | 4 ++-- apps/spreadsheeteditor/mobile/src/page/main.jsx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/documenteditor/mobile/src/page/main.jsx b/apps/documenteditor/mobile/src/page/main.jsx index 0a6715c802..3936e6dcdc 100644 --- a/apps/documenteditor/mobile/src/page/main.jsx +++ b/apps/documenteditor/mobile/src/page/main.jsx @@ -70,8 +70,8 @@ const MainPage = inject('storeDocumentInfo', 'users', 'storeAppOptions', 'storeV if(logo && isBranding) { isHideLogo = logo.visible === false; - if(logo.image || logo.imageDark) { - customLogoImage = colorTheme.type === 'dark' ? logo.imageDark ?? logo.image : logo.image ?? logo.imageDark; + if(logo.image || logo.imageDark || logo.imageLight) { + customLogoImage = colorTheme.type === 'dark' ? logo.imageDark ?? logo.image ?? logo.imageLight : logo.imageLight ?? logo.image ?? logo.imageDark; customLogoUrl = logo.url; } } else { diff --git a/apps/presentationeditor/mobile/src/page/main.jsx b/apps/presentationeditor/mobile/src/page/main.jsx index 7cbe88e394..888dfba9c6 100644 --- a/apps/presentationeditor/mobile/src/page/main.jsx +++ b/apps/presentationeditor/mobile/src/page/main.jsx @@ -170,8 +170,8 @@ class MainPage extends Component { if(logo && isBranding) { isHideLogo = logo.visible === false; - if(logo.image || logo.imageDark) { - customLogoImage = colorTheme.type === 'dark' ? logo.imageDark ?? logo.image : logo.image ?? logo.imageDark; + if(logo.image || logo.imageDark || logo.imageLight) { + customLogoImage = colorTheme.type === 'dark' ? logo.imageDark ?? logo.image ?? logo.imageLight : logo.imageLight ?? logo.image ?? logo.imageDark; customLogoUrl = logo.url; } } else { diff --git a/apps/spreadsheeteditor/mobile/src/page/main.jsx b/apps/spreadsheeteditor/mobile/src/page/main.jsx index c6f917368e..c77359bb7c 100644 --- a/apps/spreadsheeteditor/mobile/src/page/main.jsx +++ b/apps/spreadsheeteditor/mobile/src/page/main.jsx @@ -165,8 +165,8 @@ class MainPage extends Component { if(logo && isBranding) { isHideLogo = logo.visible === false; - if(logo.image || logo.imageDark) { - customLogoImage = colorTheme.type === 'dark' ? logo.imageDark ?? logo.image : logo.image ?? logo.imageDark; + if(logo.image || logo.imageDark || logo.imageLight) { + customLogoImage = colorTheme.type === 'dark' ? logo.imageDark ?? logo.image ?? logo.imageLight : logo.imageLight ?? logo.image ?? logo.imageDark; customLogoUrl = logo.url; } } else { From 20211e873ecef2998661cf926d2cad5c069effa7 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 22 Oct 2024 19:54:47 +0300 Subject: [PATCH 3/3] Fix quick access dialog --- .../main/lib/view/CustomizeQuickAccessDialog.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/common/main/lib/view/CustomizeQuickAccessDialog.js b/apps/common/main/lib/view/CustomizeQuickAccessDialog.js index 3c60b8632a..b860570254 100644 --- a/apps/common/main/lib/view/CustomizeQuickAccessDialog.js +++ b/apps/common/main/lib/view/CustomizeQuickAccessDialog.js @@ -131,13 +131,13 @@ define([], function () { 'use strict'; }, onBtnClick: function(event) { - if (event.currentTarget.attributes['result'].value == 'ok') { + if (event.currentTarget.attributes['result'].value === 'ok') { Common.NotificationCenter.trigger('quickaccess:changed', { - save: this.chSave.getValue() == 'checked', - print: this.chPrint.getValue() == 'checked', - quickPrint: this.chQuickPrint ? this.chQuickPrint.getValue() == 'checked' : undefined, - undo: this.chUndo.getValue() == 'checked', - redo: this.chRedo.getValue() == 'checked' + save: this.chSave ? this.chSave.getValue() === 'checked' : undefined, + print: this.chPrint ? this.chPrint.getValue() === 'checked' : undefined, + quickPrint: this.chQuickPrint ? this.chQuickPrint.getValue() === 'checked' : undefined, + undo: this.chUndo.getValue() === 'checked', + redo: this.chRedo.getValue() === 'checked' }); }