From 4e29149fb5b29f2ecb3beecb524a0bdbd9a7a5d6 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Thu, 30 Sep 2021 16:35:37 +0300 Subject: [PATCH] [Embedded] Change logo: imageEmbedded->image --- apps/api/documents/api.js | 6 +++--- apps/documenteditor/embed/index.html | 4 ++-- apps/documenteditor/embed/index.html.deploy | 4 ++-- apps/documenteditor/embed/js/ApplicationController.js | 6 ++++-- apps/presentationeditor/embed/index.html | 4 ++-- apps/presentationeditor/embed/index.html.deploy | 4 ++-- apps/presentationeditor/embed/js/ApplicationController.js | 6 ++++-- apps/spreadsheeteditor/embed/index.html | 4 ++-- apps/spreadsheeteditor/embed/index.html.deploy | 4 ++-- apps/spreadsheeteditor/embed/js/ApplicationController.js | 6 ++++-- 10 files changed, 27 insertions(+), 21 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 41f151f155..cc795586e5 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -105,7 +105,7 @@ customization: { logo: { image: url, - imageEmbedded: url, + imageEmbedded: url, // deprecated, use image instead url: http://... }, customer: { @@ -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) - params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.imageEmbedded); + 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); else if (config.type!='embedded' && config.editorConfig.customization.logo.image) params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image); } diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html index 32a421a62a..7355d87dd7 100644 --- a/apps/documenteditor/embed/index.html +++ b/apps/documenteditor/embed/index.html @@ -43,14 +43,14 @@ .loadmask > .brendpanel .loading-logo { max-width: 200px; - height: 24px; + height: 20px; margin-left: 10px; text-align: center; } .loadmask > .brendpanel .loading-logo > img { display: inline-block; - max-width: 124px; + max-width: 100px; max-height: 20px; opacity: 0; } diff --git a/apps/documenteditor/embed/index.html.deploy b/apps/documenteditor/embed/index.html.deploy index d06ee816ab..527732ad99 100644 --- a/apps/documenteditor/embed/index.html.deploy +++ b/apps/documenteditor/embed/index.html.deploy @@ -41,14 +41,14 @@ .loadmask > .brendpanel .loading-logo { max-width: 200px; - height: 24px; + height: 20px; margin-left: 10px; text-align: center; } .loadmask > .brendpanel .loading-logo > img { display: inline-block; - max-width: 124px; + max-width: 100px; max-height: 20px; opacity: 0; } diff --git a/apps/documenteditor/embed/js/ApplicationController.js b/apps/documenteditor/embed/js/ApplicationController.js index f3b577b53b..4a10fd9b81 100644 --- a/apps/documenteditor/embed/js/ApplicationController.js +++ b/apps/documenteditor/embed/js/ApplicationController.js @@ -599,9 +599,11 @@ DE.ApplicationController = new(function(){ config.customization && config.customization.logo ) { var logo = $('#header-logo'); - if (config.customization.logo.imageEmbedded) { - logo.html(''); + if (config.customization.logo.imageEmbedded || config.customization.logo.image) { + 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."); } if (config.customization.logo.url) { diff --git a/apps/presentationeditor/embed/index.html b/apps/presentationeditor/embed/index.html index d94d7b7654..c16fd838f4 100644 --- a/apps/presentationeditor/embed/index.html +++ b/apps/presentationeditor/embed/index.html @@ -43,14 +43,14 @@ .loadmask > .brendpanel .loading-logo { max-width: 200px; - height: 24px; + height: 20px; margin-left: 10px; text-align: center; } .loadmask > .brendpanel .loading-logo > img { display: inline-block; - max-width: 124px; + max-width: 100px; max-height: 20px; opacity: 0; } diff --git a/apps/presentationeditor/embed/index.html.deploy b/apps/presentationeditor/embed/index.html.deploy index 6bfce4d25f..540856471e 100644 --- a/apps/presentationeditor/embed/index.html.deploy +++ b/apps/presentationeditor/embed/index.html.deploy @@ -41,14 +41,14 @@ .loadmask > .brendpanel .loading-logo { max-width: 200px; - height: 24px; + height: 20px; margin-left: 10px; text-align: center; } .loadmask > .brendpanel .loading-logo > img { display: inline-block; - max-width: 124px; + max-width: 100px; max-height: 20px; opacity: 0; } diff --git a/apps/presentationeditor/embed/js/ApplicationController.js b/apps/presentationeditor/embed/js/ApplicationController.js index 8317bc3f29..3bfe038959 100644 --- a/apps/presentationeditor/embed/js/ApplicationController.js +++ b/apps/presentationeditor/embed/js/ApplicationController.js @@ -457,9 +457,11 @@ PE.ApplicationController = new(function(){ config.customization && config.customization.logo ) { var logo = $('#header-logo'); - if (config.customization.logo.imageEmbedded) { - logo.html(''); + if (config.customization.logo.imageEmbedded || config.customization.logo.image) { + 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."); } if (config.customization.logo.url) { diff --git a/apps/spreadsheeteditor/embed/index.html b/apps/spreadsheeteditor/embed/index.html index 12f2e04874..2e0f4617cd 100644 --- a/apps/spreadsheeteditor/embed/index.html +++ b/apps/spreadsheeteditor/embed/index.html @@ -43,14 +43,14 @@ .loadmask > .brendpanel .loading-logo { max-width: 200px; - height: 24px; + height: 20px; margin-left: 10px; text-align: center; } .loadmask > .brendpanel .loading-logo > img { display: inline-block; - max-width: 124px; + max-width: 100px; max-height: 20px; opacity: 0; } diff --git a/apps/spreadsheeteditor/embed/index.html.deploy b/apps/spreadsheeteditor/embed/index.html.deploy index 59dd5d1131..5bced543e7 100644 --- a/apps/spreadsheeteditor/embed/index.html.deploy +++ b/apps/spreadsheeteditor/embed/index.html.deploy @@ -40,14 +40,14 @@ .loadmask > .brendpanel .loading-logo { max-width: 200px; - height: 24px; + height: 20px; margin-left: 10px; text-align: center; } .loadmask > .brendpanel .loading-logo > img { display: inline-block; - max-width: 124px; + max-width: 100px; max-height: 20px; opacity: 0; } diff --git a/apps/spreadsheeteditor/embed/js/ApplicationController.js b/apps/spreadsheeteditor/embed/js/ApplicationController.js index 0bfa8b6d61..04b58e6e77 100644 --- a/apps/spreadsheeteditor/embed/js/ApplicationController.js +++ b/apps/spreadsheeteditor/embed/js/ApplicationController.js @@ -353,9 +353,11 @@ SSE.ApplicationController = new(function(){ config.customization && config.customization.logo ) { var logo = $('#header-logo'); - if (config.customization.logo.imageEmbedded) { - logo.html(''); + if (config.customization.logo.imageEmbedded || config.customization.logo.image) { + 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."); } if (config.customization.logo.url) {