diff --git a/apps/documenteditor/main/app/controller/LeftMenu.js b/apps/documenteditor/main/app/controller/LeftMenu.js index 48d2fe9ede..79efd4733e 100644 --- a/apps/documenteditor/main/app/controller/LeftMenu.js +++ b/apps/documenteditor/main/app/controller/LeftMenu.js @@ -493,10 +493,14 @@ define([ value = Common.localStorage.getBool("de-settings-spellcheck", true); Common.Utils.InternalSettings.set("de-settings-spellcheck", value); this.api.asc_setSpellCheck(value); - value = new AscCommon.CSpellCheckSettings(); - value.put_IgnoreWordsInUppercase(Common.localStorage.getBool("de-spellcheck-ignore-uppercase-words")); - value.put_IgnoreWordsWithNumbers(Common.localStorage.getBool("de-spellcheck-ignore-numbers-words")); - this.api.asc_setSpellCheckSettings(value); + var spprops = new AscCommon.CSpellCheckSettings(); + value = Common.localStorage.getBool("de-spellcheck-ignore-uppercase-words", true); + Common.Utils.InternalSettings.set("de-spellcheck-ignore-uppercase-words", value); + spprops.put_IgnoreWordsInUppercase(value); + value = Common.localStorage.getBool("de-spellcheck-ignore-numbers-words", true); + Common.Utils.InternalSettings.set("de-spellcheck-ignore-numbers-words", value); + spprops.put_IgnoreWordsWithNumbers(value); + this.api.asc_setSpellCheckSettings(spprops); } value = parseInt(Common.localStorage.getItem("de-settings-paste-button")); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index eb1cc69569..2040262e7a 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1167,14 +1167,16 @@ define([ me.api.asc_setSpellCheck(value); Common.NotificationCenter.trigger('spelling:turn', value ? 'on' : 'off', true); // only toggle buttons - value = Common.localStorage.getBool("de-spellcheck-ignore-uppercase-words", false); - Common.Utils.InternalSettings.set("de-spellcheck-ignore-uppercase-words", value); - value = Common.localStorage.getBool("de-spellcheck-ignore-numbers-words", false); - Common.Utils.InternalSettings.set("de-spellcheck-ignore-numbers-words", value); - value = new AscCommon.CSpellCheckSettings(); - value.put_IgnoreWordsInUppercase(Common.Utils.InternalSettings.get("de-spellcheck-ignore-uppercase-words")); - value.put_IgnoreWordsWithNumbers(Common.Utils.InternalSettings.get("de-spellcheck-ignore-numbers-words")); - this.api.asc_setSpellCheckSettings(value); + if (Common.UI.FeaturesManager.canChange('spellcheck')) { // get settings for spellcheck from local storage + value = Common.localStorage.getBool("de-spellcheck-ignore-uppercase-words", true); + Common.Utils.InternalSettings.set("de-spellcheck-ignore-uppercase-words", value); + value = Common.localStorage.getBool("de-spellcheck-ignore-numbers-words", true); + Common.Utils.InternalSettings.set("de-spellcheck-ignore-numbers-words", value); + value = new AscCommon.CSpellCheckSettings(); + value.put_IgnoreWordsInUppercase(Common.Utils.InternalSettings.get("de-spellcheck-ignore-uppercase-words")); + value.put_IgnoreWordsWithNumbers(Common.Utils.InternalSettings.get("de-spellcheck-ignore-numbers-words")); + this.api.asc_setSpellCheckSettings(value); + } value = Common.localStorage.getBool("de-settings-compatible", false); Common.Utils.InternalSettings.set("de-settings-compatible", value); diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 1fe7287df7..f12ea2fb02 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -865,12 +865,8 @@ define([ Common.localStorage.setItem("de-settings-forcesave", this.chForcesave.isChecked() ? 1 : 0); if (Common.UI.FeaturesManager.canChange('spellcheck') && this.mode.isEdit) { Common.localStorage.setItem("de-settings-spellcheck", this.chSpell.isChecked() ? 1 : 0); - var value = this.chIgnoreUppercase.isChecked(); - Common.localStorage.setBool("de-spellcheck-ignore-uppercase-words", value); - Common.Utils.InternalSettings.set("de-spellcheck-ignore-uppercase-words", value); - value = this.chIgnoreNumbers.isChecked(); - Common.localStorage.setBool("de-spellcheck-ignore-numbers-words", value); - Common.Utils.InternalSettings.set("de-spellcheck-ignore-numbers-words", value); + Common.localStorage.setBool("de-spellcheck-ignore-uppercase-words", this.chIgnoreUppercase.isChecked()); + Common.localStorage.setBool("de-spellcheck-ignore-numbers-words", this.chIgnoreNumbers.isChecked()); } Common.localStorage.setItem("de-settings-compatible", this.chCompatible.isChecked() ? 1 : 0); Common.Utils.InternalSettings.set("de-settings-compatible", this.chCompatible.isChecked() ? 1 : 0); diff --git a/apps/presentationeditor/main/app/controller/LeftMenu.js b/apps/presentationeditor/main/app/controller/LeftMenu.js index 14ce12c899..9a9837ba78 100644 --- a/apps/presentationeditor/main/app/controller/LeftMenu.js +++ b/apps/presentationeditor/main/app/controller/LeftMenu.js @@ -371,6 +371,14 @@ define([ value = Common.localStorage.getBool("pe-settings-spellcheck", true); Common.Utils.InternalSettings.set("pe-settings-spellcheck", value); this.api.asc_setSpellCheck(value); + var spprops = new AscCommon.CSpellCheckSettings(); + value = Common.localStorage.getBool("pe-spellcheck-ignore-uppercase-words", true); + Common.Utils.InternalSettings.set("pe-spellcheck-ignore-uppercase-words", value); + spprops.put_IgnoreWordsInUppercase(value); + value = Common.localStorage.getBool("pe-spellcheck-ignore-numbers-words", true); + Common.Utils.InternalSettings.set("pe-spellcheck-ignore-numbers-words", value); + spprops.put_IgnoreWordsWithNumbers(value); + this.api.asc_setSpellCheckSettings(spprops); } value = parseInt(Common.localStorage.getItem("pe-settings-paste-button")); diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index f6acea3e2e..679b38131e 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -802,6 +802,17 @@ define([ me.api.asc_setSpellCheck(value); Common.NotificationCenter.trigger('spelling:turn', value ? 'on' : 'off', true); // only toggle buttons + if (Common.UI.FeaturesManager.canChange('spellcheck')) { // get settings for spellcheck from local storage + value = Common.localStorage.getBool("pe-spellcheck-ignore-uppercase-words", true); + Common.Utils.InternalSettings.set("pe-spellcheck-ignore-uppercase-words", value); + value = Common.localStorage.getBool("pe-spellcheck-ignore-numbers-words", true); + Common.Utils.InternalSettings.set("pe-spellcheck-ignore-numbers-words", value); + value = new AscCommon.CSpellCheckSettings(); + value.put_IgnoreWordsInUppercase(Common.Utils.InternalSettings.get("pe-spellcheck-ignore-uppercase-words")); + value.put_IgnoreWordsWithNumbers(Common.Utils.InternalSettings.get("pe-spellcheck-ignore-numbers-words")); + this.api.asc_setSpellCheckSettings(value); + } + value = Common.localStorage.getBool('pe-hidden-notes', this.appOptions.customization && this.appOptions.customization.hideNotes===true); me.api.asc_ShowNotes(!value); diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index a566631be2..6f716a269e 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -240,6 +240,12 @@ define([ '