From 311f9d7ce4a4fb462e3384e5d8dfeff40f12c90a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 14 Jun 2017 12:25:09 +0300 Subject: [PATCH] Set fast co-editing when commenting in view mode. --- apps/documenteditor/main/app/controller/Main.js | 3 +++ apps/presentationeditor/main/app/controller/Main.js | 2 +- apps/spreadsheeteditor/main/app/controller/Main.js | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 80d640c36..e6e1ba9ca 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -809,6 +809,9 @@ define([ value == 'none' ? Asc.c_oAscCollaborativeMarksShowType.None : Asc.c_oAscCollaborativeMarksShowType.LastChanges); else me.api.SetCollaborativeMarksShowType(me._state.fastCoauth ? Asc.c_oAscCollaborativeMarksShowType.None : Asc.c_oAscCollaborativeMarksShowType.LastChanges); + } else if (!me.appOptions.isEdit && me.appOptions.canComments) { + me._state.fastCoauth = true; + me.api.asc_SetFastCollaborative(me._state.fastCoauth); } else { me._state.fastCoauth = false; me.api.asc_SetFastCollaborative(me._state.fastCoauth); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index b39fe5cdb..ffa16bf9b 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -588,7 +588,7 @@ define([ } me._state.fastCoauth = (value===null || parseInt(value) == 1); } else - me._state.fastCoauth = false; + me._state.fastCoauth = (!me.appOptions.isEdit && me.appOptions.canComments); me.api.asc_SetFastCollaborative(me._state.fastCoauth); /** coauthoring end **/ diff --git a/apps/spreadsheeteditor/main/app/controller/Main.js b/apps/spreadsheeteditor/main/app/controller/Main.js index d2254a453..8f0e183fe 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -557,7 +557,7 @@ define([ } this._state.fastCoauth = (value===null || parseInt(value) == 1); } else - this._state.fastCoauth = false; + this._state.fastCoauth = (!this.appOptions.isEdit && this.appOptions.canComments); this.api.asc_SetFastCollaborative(this._state.fastCoauth); /** coauthoring end **/