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

Merge tag 'v4.2.11' into develop

Browse source 
v4.2.11 v4.2.11
This commit is contained in:
Alexey Golubev 2017-03-13 10:45:57 +03:00
parent b165941332 cb90b36468
commit 606f67eadf
4 changed files with 20 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

@ -96,7 +96,7 @@
info: 'Some info',
logo: ''
},
about: false,
about: true,
feedback: {
visible: false,
url: http://...
@ -568,7 +568,7 @@
lang: 'en',
canCoAuthoring: true,
customization: {
about: false,
about: true,
feedback: false
}
}

6
apps/documenteditor/main/app/controller/Main.js
View file

@ -1479,8 +1479,12 @@ define([
hidePreloader: function() {
if (!this._state.customizationDone) {
this._state.customizationDone = true;
if (this.appOptions.customization && !this.appOptions.isDesktopApp)
if (this.appOptions.customization) {
if (this.appOptions.isDesktopApp)
this.appOptions.customization.about = false;
else if (!this.appOptions.canBrandingExt)
this.appOptions.customization.about = true;
}
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements);
if (this.appOptions.canBrandingExt) {
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements);

6
apps/presentationeditor/main/app/controller/Main.js
View file

@ -1232,8 +1232,12 @@ define([
hidePreloader: function() {
if (!this._state.customizationDone) {
this._state.customizationDone = true;
if (this.appOptions.customization && !this.appOptions.isDesktopApp)
if (this.appOptions.customization) {
if (this.appOptions.isDesktopApp)
this.appOptions.customization.about = false;
else if (!this.appOptions.canBrandingExt)
this.appOptions.customization.about = true;
}
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements);
if (this.appOptions.canBrandingExt) {
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements);

6
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -1370,8 +1370,12 @@ define([
hidePreloader: function() {
if (!this._state.customizationDone) {
this._state.customizationDone = true;
if (this.appOptions.customization && !this.appOptions.isDesktopApp)
if (this.appOptions.customization) {
if (this.appOptions.isDesktopApp)
this.appOptions.customization.about = false;
else if (!this.appOptions.canBrandingExt)
this.appOptions.customization.about = true;
}
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements);
if (this.appOptions.canBrandingExt) {
Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements);