[Embedded] Fix logo priority
This commit is contained in:
parent
308c43cfb4
commit
31ced630ea
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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('<img src="'+(config.customization.logo.imageEmbedded || config.customization.logo.image)+'" style="max-width:124px; max-height:20px;"/>');
|
||||
if (config.customization.logo.image || config.customization.logo.imageEmbedded) {
|
||||
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'});
|
||||
|
||||
config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
|
||||
|
|
|
@ -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('<img src="'+(config.customization.logo.imageEmbedded || config.customization.logo.image)+'" style="max-width:124px; max-height:20px;"/>');
|
||||
if (config.customization.logo.image || config.customization.logo.imageEmbedded) {
|
||||
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'});
|
||||
|
||||
config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
|
||||
|
|
|
@ -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('<img src="'+(config.customization.logo.imageEmbedded || config.customization.logo.image)+'" style="max-width:124px; max-height:20px;"/>');
|
||||
if (config.customization.logo.image || config.customization.logo.imageEmbedded) {
|
||||
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'});
|
||||
|
||||
config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
|
||||
|
|
Loading…
Reference in a new issue