Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Julia Radzhabova 2016-04-14 12:44:48 +03:00
parent 271bbc70d6 fdc8162719
commit ae19165f88
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -329,7 +329,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);
@ -352,7 +352,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);

4
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -273,7 +273,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);
@ -286,7 +286,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);

4
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -648,7 +648,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);
@ -665,7 +665,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)