From 31ced630ea8198ee88901c5433c5b0f0ee5f4079 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 30 Sep 2021 18:51:56 +0300 Subject: [PATCH] [Embedded] Fix logo priority --- apps/api/documents/api.js | 4 ++-- apps/documenteditor/embed/js/ApplicationController.js | 4 ++-- apps/presentationeditor/embed/js/ApplicationController.js | 4 ++-- apps/spreadsheeteditor/embed/js/ApplicationController.js | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index cc795586e..f6133e032 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -918,8 +918,8 @@ if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.loaderLogo) { if (config.editorConfig.customization.loaderLogo !== '') params += "&logo=" + encodeURIComponent(config.editorConfig.customization.loaderLogo); } else if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.logo) { - if (config.type=='embedded' && (config.editorConfig.customization.logo.imageEmbedded || config.editorConfig.customization.logo.image)) - params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.imageEmbedded || config.editorConfig.customization.logo.image); + if (config.type=='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded)) + params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded); else if (config.type!='embedded' && config.editorConfig.customization.logo.image) params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image); } diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index 4a10fd9b8..b2a3150fc 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -599,8 +599,8 @@ DE.ApplicationController = new(function(){ config.customization && config.customization.logo ) { var logo = $('#header-logo'); - if (config.customization.logo.imageEmbedded || config.customization.logo.image) { - logo.html(''); + if (config.customization.logo.image || config.customization.logo.imageEmbedded) { + logo.html(''); logo.css({'background-image': 'none', width: 'auto', height: 'auto'}); config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead."); diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index 3bfe03895..766dba5fd 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -457,8 +457,8 @@ PE.ApplicationController = new(function(){ config.customization && config.customization.logo ) { var logo = $('#header-logo'); - if (config.customization.logo.imageEmbedded || config.customization.logo.image) { - logo.html(''); + if (config.customization.logo.image || config.customization.logo.imageEmbedded) { + logo.html(''); logo.css({'background-image': 'none', width: 'auto', height: 'auto'}); config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead."); diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 04b58e6e7..68d8687a2 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -353,8 +353,8 @@ SSE.ApplicationController = new(function(){ config.customization && config.customization.logo ) { var logo = $('#header-logo'); - if (config.customization.logo.imageEmbedded || config.customization.logo.image) { - logo.html(''); + if (config.customization.logo.image || config.customization.logo.imageEmbedded) { + logo.html(''); logo.css({'background-image': 'none', width: 'auto', height: 'auto'}); config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");