From 08186157c6c455ff3451a9f67bb1ab53c19ce202 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 14 Jun 2017 14:59:43 +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 e4ad8dbf78..e8b33a9c6f 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -795,6 +795,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 257b866e39..aaec4b62ee 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -580,7 +580,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 e3799f0be5..06acfc641d 100644 --- a/apps/spreadsheeteditor/main/app/controller/Main.js +++ b/apps/spreadsheeteditor/main/app/controller/Main.js @@ -558,7 +558,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 **/