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

Merge branch 'release/v6.5.0' into fix/logo-dark

Browse source
This commit is contained in:
Julia Radzhabova 2021-10-04 23:15:06 +03:00
parent fed051e31a 5d604867a6
commit bb2abd98f2
4 changed files with 88 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -595,27 +595,12 @@ DE.ApplicationController = new(function(){
}
function onEditorPermissions(params) {
if ( (params.asc_getLicenseType() === Asc.c_oLicenseResult.Success) && (typeof config.customization == 'object') &&
config.customization && config.customization.logo ) {
var logo = $('#header-logo');
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.");
}
if (config.customization.logo.url) {
logo.attr('href', config.customization.logo.url);
} else if (config.customization.logo.url!==undefined) {
logo.removeAttr('href');logo.removeAttr('target');
}
}
var licType = params.asc_getLicenseType();
appOptions.canLicense = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit);
appOptions.canFillForms = appOptions.canLicense && (permissions.fillForms===true) && (config.mode !== 'view');
appOptions.canSubmitForms = appOptions.canLicense && (typeof (config.customization) == 'object') && !!config.customization.submitForm;
appOptions.canBranding = params.asc_getCustomization();
appOptions.canBranding && setBranding(config.customization);
api.asc_setViewMode(!appOptions.canFillForms);
@ -821,6 +806,24 @@ DE.ApplicationController = new(function(){
function onBeforeUnload () {
common.localStorage.save();
}
function setBranding(value) {
if ( value && value.logo) {
var logo = $('#header-logo');
if (value.logo.image || value.logo.imageEmbedded) {
logo.html('<img src="'+(value.logo.image || value.logo.imageEmbedded)+'" style="max-width:100px; max-height:20px;"/>');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
value.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
}
if (value.logo.url) {
logo.attr('href', value.logo.url);
} else if (value.logo.url!==undefined) {
logo.removeAttr('href');logo.removeAttr('target');
}
}
}
// Helpers
// -------------------------

47
apps/documenteditor/forms/app/controller/ApplicationController.js
View file

@ -433,23 +433,6 @@ define([
if ( this.onServerVersion(params.asc_getBuildVersion())) return;
if ( (licType === Asc.c_oLicenseResult.Success) && (typeof this.appOptions.customization == 'object') &&
this.appOptions.customization && this.appOptions.customization.logo ) {
var logo = $('#header-logo');
if (this.appOptions.customization.logo.image || this.appOptions.customization.logo.imageDark) {
var image = Common.UI.Themes.isDarkTheme() ? (this.appOptions.customization.logo.imageDark || this.appOptions.customization.logo.image) : (this.appOptions.customization.logo.image || this.appOptions.customization.logo.imageDark);
logo.html('<img src="' + image + '" style="max-width:100px; max-height:20px;"/>');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
}
if (this.appOptions.customization.logo.url) {
logo.attr('href', this.appOptions.customization.logo.url);
} else if (this.appOptions.customization.logo.url!==undefined) {
logo.removeAttr('href');logo.removeAttr('target');
}
}
this.permissions.review = (this.permissions.review === undefined) ? (this.permissions.edit !== false) : this.permissions.review;
if (params.asc_getRights() !== Asc.c_oRights.Edit)
this.permissions.edit = this.permissions.review = false;
@ -461,6 +444,9 @@ define([
this.appOptions.canFillForms = this.appOptions.canLicense && (this.permissions.fillForms===true) && (this.editorConfig.mode !== 'view');
this.api.asc_setViewMode(!this.appOptions.canFillForms);
this.appOptions.canBranding = params.asc_getCustomization();
this.appOptions.canBranding && this.setBranding(this.appOptions.customization);
this.appOptions.canDownload = this.permissions.download !== false;
this.appOptions.canPrint = (this.permissions.print !== false);
@ -583,6 +569,23 @@ define([
}
},
setBranding: function (value) {
if ( value && value.logo) {
var logo = $('#header-logo');
if (value.logo.image || value.logo.imageDark) {
var image = Common.UI.Themes.isDarkTheme() ? (value.logo.imageDark || value.logo.image) : (value.logo.image || value.logo.imageDark);
logo.html('<img src="' + image + '" style="max-width:100px; max-height:20px;"/>');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
}
if (value.logo.url) {
logo.attr('href', value.logo.url);
} else if (value.logo.url!==undefined) {
logo.removeAttr('href');logo.removeAttr('target');
}
}
},
onLongActionBegin: function(type, id) {
var action = {id: id, type: type};
this.stackLongActions.push(action);
@ -1075,10 +1078,12 @@ define([
_.each(this.view.mnuThemes.items, function(item){
item.setChecked(current===item.value, true);
});
var value = this.appOptions.customization;
if ( value && value.logo && (value.logo.image || value.logo.imageDark) && (value.logo.image !== value.logo.imageDark)) {
var image = Common.UI.Themes.isDarkTheme() ? (value.logo.imageDark || value.logo.image) : (value.logo.image || value.logo.imageDark);
$('#header-logo img').attr('src', image);
if (this.appOptions.canBranding) {
var value = this.appOptions.customization;
if ( value && value.logo && (value.logo.image || value.logo.imageDark) && (value.logo.image !== value.logo.imageDark)) {
var image = Common.UI.Themes.isDarkTheme() ? (value.logo.imageDark || value.logo.image) : (value.logo.image || value.logo.imageDark);
$('#header-logo img').attr('src', image);
}
}
},

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

@ -37,6 +37,7 @@ PE.ApplicationController = new(function(){
docConfig = {},
embedConfig = {},
permissions = {},
appOptions = {},
maxPages = 0,
created = false,
currentPage = 0,
@ -453,23 +454,8 @@ PE.ApplicationController = new(function(){
}
function onEditorPermissions(params) {
if ( (params.asc_getLicenseType() === Asc.c_oLicenseResult.Success) && (typeof config.customization == 'object') &&
config.customization && config.customization.logo ) {
var logo = $('#header-logo');
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.");
}
if (config.customization.logo.url) {
logo.attr('href', config.customization.logo.url);
} else if (config.customization.logo.url!==undefined) {
logo.removeAttr('href');logo.removeAttr('target');
}
}
appOptions.canBranding = params.asc_getCustomization();
appOptions.canBranding && setBranding(config.customization);
var $parent = labelDocName.parent();
var _left_width = $parent.position().left,
@ -655,6 +641,24 @@ PE.ApplicationController = new(function(){
function onBeforeUnload () {
common.localStorage.save();
}
function setBranding(value) {
if ( value && value.logo) {
var logo = $('#header-logo');
if (value.logo.image || value.logo.imageEmbedded) {
logo.html('<img src="'+(value.logo.image || value.logo.imageEmbedded)+'" style="max-width:100px; max-height:20px;"/>');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
value.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
}
if (value.logo.url) {
logo.attr('href', value.logo.url);
} else if (value.logo.url!==undefined) {
logo.removeAttr('href');logo.removeAttr('target');
}
}
}
// Helpers
// -------------------------

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

@ -37,6 +37,7 @@ SSE.ApplicationController = new(function(){
docConfig = {},
embedConfig = {},
permissions = {},
appOptions = {},
maxPages = 0,
created = false,
iframePrint = null;
@ -349,23 +350,8 @@ SSE.ApplicationController = new(function(){
}
function onEditorPermissions(params) {
if ( (params.asc_getLicenseType() === Asc.c_oLicenseResult.Success) && (typeof config.customization == 'object') &&
config.customization && config.customization.logo ) {
var logo = $('#header-logo');
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.");
}
if (config.customization.logo.url) {
logo.attr('href', config.customization.logo.url);
} else if (config.customization.logo.url!==undefined) {
logo.removeAttr('href');logo.removeAttr('target');
}
}
appOptions.canBranding = params.asc_getCustomization();
appOptions.canBranding && setBranding(config.customization);
var $parent = labelDocName.parent();
var _left_width = $parent.position().left,
@ -608,6 +594,24 @@ SSE.ApplicationController = new(function(){
function onBeforeUnload () {
common.localStorage.save();
}
function setBranding(value) {
if ( value && value.logo) {
var logo = $('#header-logo');
if (value.logo.image || value.logo.imageEmbedded) {
logo.html('<img src="'+(value.logo.image || value.logo.imageEmbedded)+'" style="max-width:100px; max-height:20px;"/>');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
value.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
}
if (value.logo.url) {
logo.attr('href', value.logo.url);
} else if (value.logo.url!==undefined) {
logo.removeAttr('href');logo.removeAttr('target');
}
}
}
// Helpers
// -------------------------