From 8c55b7cf649cc5857f48ee4ae82cfe06b8393184 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Tue, 7 Sep 2021 13:39:38 +0300 Subject: [PATCH] [DE][PE] Fix Bug 52335 --- .../main/lib/template/AutoCorrectDialog.template | 5 ++++- apps/common/main/lib/view/AutoCorrectDialog.js | 16 ++++++++++++++-- apps/documenteditor/main/app/controller/Main.js | 4 ++++ apps/documenteditor/main/locale/en.json | 1 + .../main/app/controller/Main.js | 4 ++++ apps/presentationeditor/main/locale/en.json | 1 + 6 files changed, 28 insertions(+), 3 deletions(-) diff --git a/apps/common/main/lib/template/AutoCorrectDialog.template b/apps/common/main/lib/template/AutoCorrectDialog.template index b682a1e0a..6bded0028 100644 --- a/apps/common/main/lib/template/AutoCorrectDialog.template +++ b/apps/common/main/lib/template/AutoCorrectDialog.template @@ -98,8 +98,11 @@
-
+
+
+
+
diff --git a/apps/common/main/lib/view/AutoCorrectDialog.js b/apps/common/main/lib/view/AutoCorrectDialog.js index 67741da94..4d813d42c 100644 --- a/apps/common/main/lib/view/AutoCorrectDialog.js +++ b/apps/common/main/lib/view/AutoCorrectDialog.js @@ -337,6 +337,17 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', me.api.asc_SetAutoCorrectFirstLetterOfSentences && me.api.asc_SetAutoCorrectFirstLetterOfSentences(checked); }); + this.chFLCells = new Common.UI.CheckBox({ + el: $window.find('#id-autocorrect-dialog-chk-fl-cells'), + labelText: this.textFLCells, + value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-fl-cells") + }).on('change', function(field, newValue, oldValue, eOpts){ + var checked = (field.getValue()==='checked'); + Common.localStorage.setBool(me.appPrefix + "settings-autoformat-fl-cells", checked); + Common.Utils.InternalSettings.set(me.appPrefix + "settings-autoformat-fl-cells", checked); + me.api.asc_SetAutoCorrectFirstLetterOfCells && me.api.asc_SetAutoCorrectFirstLetterOfCells(checked); + }); + this.btnsCategory[3].on('click', _.bind(this.onAutocorrectCategoryClick, this, false)); } else if (this.appPrefix=='sse-') { this.chNewRows = new Common.UI.CheckBox({ @@ -384,7 +395,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', this.chHyperlink // 2 tab ]; arr = arr.concat(this.chNewRows ? [this.chNewRows] : [this.chQuotes, this.chHyphens, this.chBulleted, this.chNumbered]); - arr = arr.concat(this.chFLSentence ? [this.chFLSentence] : []); + arr = arr.concat(this.chFLSentence ? [this.chFLSentence, this.chFLCells] : []); return arr; }, @@ -829,7 +840,8 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', textNewRowCol: 'Include new rows and columns in table', textAutoCorrect: 'AutoCorrect', textFLSentence: 'Capitalize first letter of sentences', - textHyperlink: 'Internet and network paths with hyperlinks' + textHyperlink: 'Internet and network paths with hyperlinks', + textFLCells: 'Capitalize first letter of table cells' }, Common.Views.AutoCorrectDialog || {})) }); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index a8e39c689..60de9f914 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -2611,6 +2611,10 @@ define([ value = Common.localStorage.getBool("de-settings-autoformat-hyperlink", true); Common.Utils.InternalSettings.set("de-settings-autoformat-hyperlink", value); me.api.asc_SetAutoCorrectHyperlinks(value); + + value = Common.localStorage.getBool("de-settings-autoformat-fl-cells", true); + Common.Utils.InternalSettings.set("de-settings-autoformat-fl-cells", value); + me.api.asc_SetAutoCorrectFirstLetterOfCells(value); }, showRenameUserDialog: function() { diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 7d178ffce..ac40e9945 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -233,6 +233,7 @@ "Common.Views.AutoCorrectDialog.warnReplace": "The autocorrect entry for %1 already exists. Do you want to replace it?", "Common.Views.AutoCorrectDialog.warnReset": "Any autocorrect you added will be removed and the changed ones will be restored to their original values. Do you want to continue?", "Common.Views.AutoCorrectDialog.warnRestore": "The autocorrect entry for %1 will be reset to its original value. Do you want to continue?", + "Common.Views.AutoCorrectDialog.textFLCells": "Capitalize first letter of table cells", "Common.Views.Chat.textSend": "Send", "Common.Views.Comments.mniAuthorAsc": "Author A to Z", "Common.Views.Comments.mniAuthorDesc": "Author Z to A", diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 2de52dfd8..c8f9d7bf9 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -2233,6 +2233,10 @@ define([ value = Common.localStorage.getBool("pe-settings-autoformat-hyperlink", true); Common.Utils.InternalSettings.set("pe-settings-autoformat-hyperlink", value); me.api.asc_SetAutoCorrectHyperlinks(value); + + value = Common.localStorage.getBool("pe-settings-autoformat-fl-cells", true); + Common.Utils.InternalSettings.set("pe-settings-autoformat-fl-cells", value); + me.api.asc_SetAutoCorrectFirstLetterOfCells && me.api.asc_SetAutoCorrectFirstLetterOfCells(value); }, showRenameUserDialog: function() { diff --git a/apps/presentationeditor/main/locale/en.json b/apps/presentationeditor/main/locale/en.json index 8af78e0a2..61dcfd35d 100644 --- a/apps/presentationeditor/main/locale/en.json +++ b/apps/presentationeditor/main/locale/en.json @@ -126,6 +126,7 @@ "Common.Views.AutoCorrectDialog.warnReplace": "The autocorrect entry for %1 already exists. Do you want to replace it?", "Common.Views.AutoCorrectDialog.warnReset": "Any autocorrect you added will be removed and the changed ones will be restored to their original values. Do you want to continue?", "Common.Views.AutoCorrectDialog.warnRestore": "The autocorrect entry for %1 will be reset to its original value. Do you want to continue?", + "Common.Views.AutoCorrectDialog.textFLCells": "Capitalize first letter of table cells", "Common.Views.Chat.textSend": "Send", "Common.Views.Comments.mniAuthorAsc": "Author A to Z", "Common.Views.Comments.mniAuthorDesc": "Author Z to A",