Commit 1c9116d1 authored by Alexander.Trofimov's avatar Alexander.Trofimov

fix reset canStartCoAuthoring and canUnlockDocument

parent 1b38877a
...@@ -1439,9 +1439,9 @@ var editor; ...@@ -1439,9 +1439,9 @@ var editor;
this.canUnlockDocument2 = this.canUnlockDocument; this.canUnlockDocument2 = this.canUnlockDocument;
if (this.canUnlockDocument && this.canStartCoAuthoring) { if (this.canUnlockDocument && this.canStartCoAuthoring) {
this.CoAuthoringApi.onStartCoAuthoring(true); this.CoAuthoringApi.onStartCoAuthoring(true);
this.canStartCoAuthoring = false;
this.canUnlockDocument = false;
} }
this.canStartCoAuthoring = false;
this.canUnlockDocument = false;
AscCommon.CollaborativeEditing.Clear_CollaborativeMarks(); AscCommon.CollaborativeEditing.Clear_CollaborativeMarks();
// Принимаем чужие изменения // Принимаем чужие изменения
...@@ -2960,7 +2960,7 @@ var editor; ...@@ -2960,7 +2960,7 @@ var editor;
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
////////////////////////////AutoSave api///////////////////////////////// ////////////////////////////AutoSave api/////////////////////////////////
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
spreadsheet_api.prototype._autoSave = function () { spreadsheet_api.prototype._autoSave = function () {
if (!this.DocumentLoadComplete || (!this.canUnlockDocument && 0 === this.autoSaveGap && if (!this.DocumentLoadComplete || (!this.canUnlockDocument && 0 === this.autoSaveGap &&
(!this.collaborativeEditing.getFast() || !this.collaborativeEditing.getCollaborativeEditing())) || (!this.collaborativeEditing.getFast() || !this.collaborativeEditing.getCollaborativeEditing())) ||
this.asc_getCellEditMode() || this.asc_getIsTrackShape() || this.isOpenedChartFrame || this.asc_getCellEditMode() || this.asc_getIsTrackShape() || this.isOpenedChartFrame ||
......
...@@ -1832,9 +1832,9 @@ background-repeat: no-repeat;\ ...@@ -1832,9 +1832,9 @@ background-repeat: no-repeat;\
this.canUnlockDocument2 = this.canUnlockDocument; this.canUnlockDocument2 = this.canUnlockDocument;
if (this.canUnlockDocument && this.canStartCoAuthoring) { if (this.canUnlockDocument && this.canStartCoAuthoring) {
this.CoAuthoringApi.onStartCoAuthoring(true); this.CoAuthoringApi.onStartCoAuthoring(true);
this.canStartCoAuthoring = false;
this.canUnlockDocument = false;
} }
this.canStartCoAuthoring = false;
this.canUnlockDocument = false;
if (c_oAscCollaborativeMarksShowType.LastChanges === this.CollaborativeMarksShowType) if (c_oAscCollaborativeMarksShowType.LastChanges === this.CollaborativeMarksShowType)
{ {
......
...@@ -1795,9 +1795,9 @@ background-repeat: no-repeat;\ ...@@ -1795,9 +1795,9 @@ background-repeat: no-repeat;\
this.canUnlockDocument2 = this.canUnlockDocument; this.canUnlockDocument2 = this.canUnlockDocument;
if (this.canUnlockDocument && this.canStartCoAuthoring) { if (this.canUnlockDocument && this.canStartCoAuthoring) {
this.CoAuthoringApi.onStartCoAuthoring(true); this.CoAuthoringApi.onStartCoAuthoring(true);
this.canStartCoAuthoring = false;
this.canUnlockDocument = false;
} }
this.canStartCoAuthoring = false;
this.canUnlockDocument = false;
if (c_oAscCollaborativeMarksShowType.LastChanges === this.CollaborativeMarksShowType) if (c_oAscCollaborativeMarksShowType.LastChanges === this.CollaborativeMarksShowType)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment