From c9cc58fd3d926e39c5b98cc44f89085382be4534 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 7 Mar 2017 14:35:27 +0300 Subject: [PATCH 1/2] Use customization->about for hiding about in the left panel (for licensed users only). --- apps/api/documents/api.js | 4 ++-- apps/documenteditor/main/app/controller/Main.js | 8 ++++++-- apps/presentationeditor/main/app/controller/Main.js | 8 ++++++-- apps/spreadsheeteditor/main/app/controller/Main.js | 8 ++++++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 9cbde2d19..6739b3e48 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -96,7 +96,7 @@ info: 'Some info', logo: '' }, - about: false, + about: true, feedback: { visible: false, url: http://... @@ -551,7 +551,7 @@ lang: 'en', canCoAuthoring: true, customization: { - about: false, + about: true, feedback: false } } diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 5a1eb8608..e648f7c75 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1474,8 +1474,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.canBranding) + this.appOptions.customization.about = true; + } Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); if (this.appOptions.canBrandingExt) { Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 88673ed5c..3afe23153 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1227,8 +1227,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.canBranding) + this.appOptions.customization.about = true; + } Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); if (this.appOptions.canBrandingExt) { Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index c96cab58c..5d90ea448 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1365,8 +1365,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.canBranding) + this.appOptions.customization.about = true; + } Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); if (this.appOptions.canBrandingExt) { Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationExtElements); From ea4339f69377a650bfaeff9549c517a3b71d0151 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 7 Mar 2017 15:15:29 +0300 Subject: [PATCH 2/2] Can hide about when asc_getCanBranding() is true. --- apps/documenteditor/main/app/controller/Main.js | 2 +- apps/presentationeditor/main/app/controller/Main.js | 2 +- apps/spreadsheeteditor/main/app/controller/Main.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index e648f7c75..8082c9c31 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1477,7 +1477,7 @@ define([ if (this.appOptions.customization) { if (this.appOptions.isDesktopApp) this.appOptions.customization.about = false; - else if (!this.appOptions.canBranding) + else if (!this.appOptions.canBrandingExt) this.appOptions.customization.about = true; } Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 3afe23153..22219b690 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -1230,7 +1230,7 @@ define([ if (this.appOptions.customization) { if (this.appOptions.isDesktopApp) this.appOptions.customization.about = false; - else if (!this.appOptions.canBranding) + else if (!this.appOptions.canBrandingExt) this.appOptions.customization.about = true; } Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements); diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 5d90ea448..3b60e6f86 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -1368,7 +1368,7 @@ define([ if (this.appOptions.customization) { if (this.appOptions.isDesktopApp) this.appOptions.customization.about = false; - else if (!this.appOptions.canBranding) + else if (!this.appOptions.canBrandingExt) this.appOptions.customization.about = true; } Common.Utils.applyCustomization(this.appOptions.customization, mapCustomizationElements);