Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[Embedded] Fix logo priority

Browse source
This commit is contained in:
Julia Radzhabova 2021-09-30 18:51:56 +03:00
parent 308c43cfb4
commit 31ced630ea
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/api/documents/api.js
View file

@ -918,8 +918,8 @@
if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.loaderLogo) { if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.loaderLogo) {
if (config.editorConfig.customization.loaderLogo !== '') params += "&logo=" + encodeURIComponent(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) { } 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)) if (config.type=='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded))
params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.imageEmbedded || config.editorConfig.customization.logo.image); params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded);
else if (config.type!='embedded' && config.editorConfig.customization.logo.image) else if (config.type!='embedded' && config.editorConfig.customization.logo.image)
params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image); params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image);
} }

4
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -599,8 +599,8 @@ DE.ApplicationController = new(function(){
config.customization && config.customization.logo ) { config.customization && config.customization.logo ) {
var logo = $('#header-logo'); var logo = $('#header-logo');
if (config.customization.logo.imageEmbedded || config.customization.logo.image) { if (config.customization.logo.image || config.customization.logo.imageEmbedded) {
logo.html('<img src="'+(config.customization.logo.imageEmbedded || config.customization.logo.image)+'" style="max-width:124px; max-height:20px;"/>'); logo.html('<img src="'+(config.customization.logo.image || config.customization.logo.imageEmbedded)+'" style="max-width:100px; max-height:20px;"/>');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'}); 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."); config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");

4
apps/presentationeditor/embed/js/ApplicationController.js
View file

@ -457,8 +457,8 @@ PE.ApplicationController = new(function(){
config.customization && config.customization.logo ) { config.customization && config.customization.logo ) {
var logo = $('#header-logo'); var logo = $('#header-logo');
if (config.customization.logo.imageEmbedded || config.customization.logo.image) { if (config.customization.logo.image || config.customization.logo.imageEmbedded) {
logo.html('<img src="'+(config.customization.logo.imageEmbedded || config.customization.logo.image)+'" style="max-width:124px; max-height:20px;"/>'); logo.html('<img src="'+(config.customization.logo.image || config.customization.logo.imageEmbedded)+'" style="max-width:100px; max-height:20px;"/>');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'}); 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."); config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");

4
apps/spreadsheeteditor/embed/js/ApplicationController.js
View file

@ -353,8 +353,8 @@ SSE.ApplicationController = new(function(){
config.customization && config.customization.logo ) { config.customization && config.customization.logo ) {
var logo = $('#header-logo'); var logo = $('#header-logo');
if (config.customization.logo.imageEmbedded || config.customization.logo.image) { if (config.customization.logo.image || config.customization.logo.imageEmbedded) {
logo.html('<img src="'+(config.customization.logo.imageEmbedded || config.customization.logo.image)+'" style="max-width:124px; max-height:20px;"/>'); logo.html('<img src="'+(config.customization.logo.image || config.customization.logo.imageEmbedded)+'" style="max-width:100px; max-height:20px;"/>');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'}); 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."); config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");