From 2a141b4ceb795ac68170dd95a5752e54dbfc3026 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 4 Sep 2019 15:37:57 +0300 Subject: [PATCH] [DE][PE] Fix Bug 42696 --- apps/api/documents/api.js | 3 ++- apps/common/main/lib/controller/ReviewChanges.js | 2 +- apps/documenteditor/main/app/controller/Main.js | 2 +- apps/presentationeditor/main/app/controller/Main.js | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/api/documents/api.js b/apps/api/documents/api.js index 74667b038a..cf378efd73 100644 --- a/apps/api/documents/api.js +++ b/apps/api/documents/api.js @@ -128,7 +128,8 @@ compactHeader: false, toolbarNoTabs: false, toolbarHideFileName: false, - reviewDisplay: 'original' + reviewDisplay: 'original', + spellcheck: true }, plugins: { autostart: ['asc.{FFE1F462-1EA2-4391-990D-4CC84940B754}'], diff --git a/apps/common/main/lib/controller/ReviewChanges.js b/apps/common/main/lib/controller/ReviewChanges.js index f6c966be07..4119b1e2b7 100644 --- a/apps/common/main/lib/controller/ReviewChanges.js +++ b/apps/common/main/lib/controller/ReviewChanges.js @@ -643,7 +643,7 @@ define([ onAppReady: function (config) { var me = this; - if ( me.view && Common.localStorage.getBool(me.view.appPrefix + "settings-spellcheck", true) ) + if ( me.view && Common.localStorage.getBool(me.view.appPrefix + "settings-spellcheck", !(config.customization && config.customization.spellcheck===false))) me.view.turnSpelling(true); if ( config.canReview ) { diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index 8ae8280137..f396ceba79 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -890,7 +890,7 @@ define([ value = Common.localStorage.getItem("de-show-tableline"); me.api.put_ShowTableEmptyLine((value!==null) ? eval(value) : true); - value = Common.localStorage.getBool("de-settings-spellcheck", true); + value = Common.localStorage.getBool("de-settings-spellcheck", !(this.appOptions.customization && this.appOptions.customization.spellcheck===false)); Common.Utils.InternalSettings.set("de-settings-spellcheck", value); me.api.asc_setSpellCheck(value); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 403b24c96d..ffe888a809 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -645,7 +645,7 @@ define([ var zf = (value!==null) ? parseInt(value) : (this.appOptions.customization && this.appOptions.customization.zoom ? parseInt(this.appOptions.customization.zoom) : -1); (zf == -1) ? this.api.zoomFitToPage() : ((zf == -2) ? this.api.zoomFitToWidth() : this.api.zoom(zf>0 ? zf : 100)); - value = Common.localStorage.getBool("pe-settings-spellcheck", true); + value = Common.localStorage.getBool("pe-settings-spellcheck", !(this.appOptions.customization && this.appOptions.customization.spellcheck===false)); Common.Utils.InternalSettings.set("pe-settings-spellcheck", value); me.api.asc_setSpellCheck(value);