From 33dc2ca3e353b6a035d8830d81e94e4da15840ac Mon Sep 17 00:00:00 2001 From: "Alexander.Trofimov" Date: Thu, 16 Jun 2016 17:49:48 +0300 Subject: [PATCH] Revert "update mode" This reverts commit 2d33507f5a0fec359cec394b7af8dfd83f1f9471. --- 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 34afb5330..c49c19240 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -929,7 +929,7 @@ define([ /** coauthoring end **/ this.permissions.review = (this.permissions.review === undefined) ? (this.permissions.edit !== false) : this.permissions.review; this.appOptions.canAnalytics = params.asc_getIsAnalyticsEnable(); - this.appOptions.canLicense = true || (params.asc_getCanLicense ? params.asc_getCanLicense() : false); + this.appOptions.canLicense = params.asc_getCanLicense ? params.asc_getCanLicense() : false; this.appOptions.isOffline = this.api.asc_isOffline(); this.appOptions.isReviewOnly = (this.permissions.review === true) && (this.permissions.edit === false); this.appOptions.canEdit = (this.permissions.edit !== false || this.permissions.review === true) && // can edit or review diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index c7a57a1d8..99e9e6415 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -711,7 +711,7 @@ define([ this.appOptions.canCoAuthoring = true; /** coauthoring end **/ this.appOptions.isOffline = this.api.asc_isOffline(); - this.appOptions.canLicense = true || (params.asc_getCanLicense ? params.asc_getCanLicense() : false); + this.appOptions.canLicense = params.asc_getCanLicense ? params.asc_getCanLicense() : false; this.appOptions.canEdit = this.permissions.edit !== false && // can edit (this.editorConfig.canRequestEditRights || this.editorConfig.mode !== 'view'); // if mode=="view" -> canRequestEditRights must be defined this.appOptions.isEdit = this.appOptions.canLicense && this.appOptions.canEdit && this.editorConfig.mode !== 'view'; diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index 7a3c430f6..7d0c41f71 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -726,7 +726,7 @@ define([ this.appOptions.canCoAuthoring = true; /** coauthoring end **/ this.appOptions.isOffline = this.api.asc_isOffline(); - this.appOptions.canLicense = true || (params.asc_getCanLicense ? params.asc_getCanLicense() : false); + this.appOptions.canLicense = params.asc_getCanLicense ? params.asc_getCanLicense() : false; this.appOptions.canComments = this.appOptions.canLicense && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.comments===false); this.appOptions.canChat = this.appOptions.canLicense && !this.appOptions.isOffline && !((typeof (this.editorConfig.customization) == 'object') && this.editorConfig.customization.chat===false);