Merge tag 'v4.2.11' into develop

v4.2.11 v4.2.11

apps/api/documents/api.js

@@ -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
             }
         }

apps/documenteditor/main/app/controller/Main.js

@@ -1479,8 +1479,12 @@ define([
             hidePreloader: function() {
                 if (!this._state.customizationDone) {
                     this._state.customizationDone = true;
-                    if (this.appOptions.customization && !this.appOptions.isDesktopApp)
-                        this.appOptions.customization.about = true;
+                    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);

apps/presentationeditor/main/app/controller/Main.js

@@ -1232,8 +1232,12 @@ define([
             hidePreloader: function() {
                 if (!this._state.customizationDone) {
                     this._state.customizationDone = true;
-                    if (this.appOptions.customization && !this.appOptions.isDesktopApp)
-                        this.appOptions.customization.about = true;
+                    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);

apps/spreadsheeteditor/main/app/controller/Main.js

@@ -1370,8 +1370,12 @@ define([
             hidePreloader: function() {
                 if (!this._state.customizationDone) {
                     this._state.customizationDone = true;
-                    if (this.appOptions.customization && !this.appOptions.isDesktopApp)
-                        this.appOptions.customization.about = true;
+                    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);