Merge branch 'develop' of https://github.com/ONLYOFFICE/web-apps into develop

apps/documenteditor/main/app/view/FileMenuPanels.js

@@ -321,7 +321,7 @@ define([
             this.chLiveComment.setValue(!(value!==null && parseInt(value) == 0));
 
             value = Common.localStorage.getItem("de-settings-coauthmode");
-            var fast_coauth = (value===null || parseInt(value) == 1);
+            var fast_coauth = (value===null || parseInt(value) == 1) && !(this.mode.isDesktopApp && this.mode.isOffline);
 
             item = this.cmbCoAuthMode.store.findWhere({value: parseInt(value)});
             this.cmbCoAuthMode.setValue(item ? item.get('value') : 1);
@@ -344,7 +344,7 @@ define([
             this._oldUnits = this.cmbUnit.getValue();
 
             value = Common.localStorage.getItem("de-settings-autosave");
-            this.chAutosave.setValue(fast_coauth);
+            this.chAutosave.setValue(fast_coauth || (value===null || parseInt(value) == 1));
 
             value = Common.localStorage.getItem("de-settings-spellcheck");
             this.chSpell.setValue(value===null || parseInt(value) == 1);

apps/presentationeditor/main/app/view/FileMenuPanels.js

@@ -265,7 +265,7 @@ define([
 
             /** coauthoring begin **/
             value = Common.localStorage.getItem("pe-settings-coauthmode");
-            var fast_coauth = (value===null || parseInt(value) == 1);
+            var fast_coauth = (value===null || parseInt(value) == 1) && !(this.mode.isDesktopApp && this.mode.isOffline);
 
             item = this.cmbCoAuthMode.store.findWhere({value: parseInt(value)});
             this.cmbCoAuthMode.setValue(item ? item.get('value') : 1);
@@ -278,7 +278,7 @@ define([
             this._oldUnits = this.cmbUnit.getValue();
 
             value = Common.localStorage.getItem("pe-settings-autosave");
-            this.chAutosave.setValue(fast_coauth);
+            this.chAutosave.setValue(fast_coauth || (value===null || parseInt(value) == 1));
 
             value = Common.localStorage.getItem("pe-settings-showsnaplines");
             this.chAlignGuides.setValue(value===null || parseInt(value) == 1);

apps/spreadsheeteditor/main/app/view/FileMenuPanels.js

@@ -640,7 +640,7 @@ define([
             this.chLiveComment.setValue(!(value!==null && parseInt(value) == 0));
 
             value = Common.localStorage.getItem("sse-settings-coauthmode");
-            var fast_coauth = (value===null || parseInt(value) == 1);
+            var fast_coauth = (value===null || parseInt(value) == 1) && !(this.mode.isDesktopApp && this.mode.isOffline);
 
             item = this.cmbCoAuthMode.store.findWhere({value: parseInt(value)});
             this.cmbCoAuthMode.setValue(item ? item.get('value') : 1);
@@ -657,7 +657,7 @@ define([
             this._oldUnits = this.cmbUnit.getValue();
 
             value = Common.localStorage.getItem("sse-settings-autosave");
-            this.chAutosave.setValue(fast_coauth);
+            this.chAutosave.setValue(fast_coauth || (value===null || parseInt(value) == 1));
 
             value = Common.localStorage.getItem("sse-settings-func-locale");
             if (value===null)