Merge pull request 'fix/bugfix' (#91) from fix/bugfix into hotfix/v8.2.1

ONLYOFFICE · Oct 22, 2024 · 8c31fac · 8c31fac
2 parents 11b3381 + 20211e8
commit 8c31fac
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 12 deletions.
diff --git 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'
                 });
             }
 

diff --git 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/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);
             }
         },
 

diff --git 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
@@ -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 {