From 76d599fcddbd0467d40f79f2e5746a64ab51997f Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 12 Aug 2020 20:30:04 +0300 Subject: [PATCH] [DE] Add autoformat options --- .../lib/template/AutoCorrectDialog.template | 18 ++++ .../common/main/lib/view/AutoCorrectDialog.js | 92 +++++++++++++++++-- .../main/app/controller/Main.js | 57 ++++++++---- apps/documenteditor/main/locale/en.json | 7 ++ 4 files changed, 149 insertions(+), 25 deletions(-) diff --git a/apps/common/main/lib/template/AutoCorrectDialog.template b/apps/common/main/lib/template/AutoCorrectDialog.template index e7ec47cf3..bd9fc515b 100644 --- a/apps/common/main/lib/template/AutoCorrectDialog.template +++ b/apps/common/main/lib/template/AutoCorrectDialog.template @@ -61,3 +61,21 @@ +
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+
diff --git a/apps/common/main/lib/view/AutoCorrectDialog.js b/apps/common/main/lib/view/AutoCorrectDialog.js index 424017501..b9b8b08a4 100644 --- a/apps/common/main/lib/view/AutoCorrectDialog.js +++ b/apps/common/main/lib/view/AutoCorrectDialog.js @@ -42,7 +42,8 @@ if (Common === undefined) var Common = {}; define([ 'text!common/main/lib/template/AutoCorrectDialog.template', 'common/main/lib/component/ListView', - 'common/main/lib/component/Window' + 'common/main/lib/component/Window', + 'common/main/lib/component/CheckBox' ], function (contentTemplate) { 'use strict'; Common.Views.AutoCorrectDialog = Common.Views.AdvancedSettingsWindow.extend(_.extend({ @@ -57,13 +58,17 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', var filter = Common.localStorage.getKeysFilter(); this.appPrefix = (filter && filter.length) ? filter.split(',')[0] : ''; + var items = [ + {panelId: 'id-autocorrect-dialog-settings-math', panelCaption: this.textMathCorrect}, + {panelId: 'id-autocorrect-dialog-settings-recognized', panelCaption: this.textRecognized} + ]; + if (this.appPrefix=='de-') + items.push({panelId: 'id-autocorrect-dialog-settings-de-autoformat', panelCaption: this.textAutoFormat}); + _.extend(this.options, { title: this.textTitle, storageName: this.appPrefix + 'autocorrect-dialog-category', - items: [ - {panelId: 'id-autocorrect-dialog-settings-math', panelCaption: this.textMathCorrect}, - {panelId: 'id-autocorrect-dialog-settings-recognized', panelCaption: this.textRecognized} - ], + items: items, template: [ '
', '
', @@ -77,6 +82,8 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', '
', '
', '', + '', + '', '
' ].join('') }, options || {}); @@ -84,7 +91,6 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', this.mathStore = this.options.mathStore || new Common.UI.DataViewStore(); this.functionsStore = this.options.functionsStore || new Common.UI.DataViewStore(); this.api = this.options.api; - this.handler = this.options.handler; var path = this.appPrefix + "settings-math-correct"; var value = Common.Utils.InternalSettings.get(path + "-add"); @@ -98,6 +104,33 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', value = Common.Utils.InternalSettings.get(path + "-rem"); this.arrRemRec = value ? JSON.parse(value) : []; + if (this.appPrefix=='de-') { + var me = this; + this.options.handler = function(result, value) { + if ( result == 'ok' ) { + var value = me.chBulleted.getValue()==='checked'; + Common.localStorage.setBool("de-settings-autoformat-bulleted", value); + Common.Utils.InternalSettings.set("de-settings-autoformat-bulleted", value); + me.api.asc_SetAutomaticBulletedLists(value); + + value = me.chNumbered.getValue()==='checked'; + Common.localStorage.setBool("de-settings-autoformat-numbered", value); + Common.Utils.InternalSettings.set("de-settings-autoformat-numbered", value); + me.api.asc_SetAutomaticNumberedLists(value); + + value = me.chQuotes.getValue()==='checked'; + Common.localStorage.setBool("de-settings-autoformat-smart-quotes", value); + Common.Utils.InternalSettings.set("de-settings-autoformat-smart-quotes", value); + me.api.asc_SetAutoCorrectSmartQuotes(value); + + value = me.chHyphens.getValue()==='checked'; + Common.localStorage.setBool("de-settings-autoformat-hyphens", value); + Common.Utils.InternalSettings.set("de-settings-autoformat-hyphens", value); + me.api.asc_SetAutoCorrectHyphensWithDash(value); + } + }; + } + Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options); }, @@ -271,8 +304,35 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', }); this.btnDeleteRec.on('click', _.bind(this.onDeleteRec, this, false)); + if (this.appPrefix=='de-') { + this.chQuotes = new Common.UI.CheckBox({ + el: $('#id-autocorrect-dialog-chk-quotes'), + labelText: this.textQuotes, + value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-smart-quotes") + }); + this.chHyphens = new Common.UI.CheckBox({ + el: $('#id-autocorrect-dialog-chk-hyphens'), + labelText: this.textHyphens, + value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-hyphens") + }); + this.chBulleted = new Common.UI.CheckBox({ + el: $('#id-autocorrect-dialog-chk-bulleted'), + labelText: this.textBulleted, + value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-bulleted") + }); + this.chNumbered = new Common.UI.CheckBox({ + el: $('#id-autocorrect-dialog-chk-numbered'), + labelText: this.textNumbered, + value: Common.Utils.InternalSettings.get(this.appPrefix + "settings-autoformat-numbered") + }); + } + + this.applyButtons = $window.find('.dlg-btn.can-apply'); + this.closeButtons = $window.find('.dlg-btn:not(.can-apply)'); + this.btnsCategory[0].on('click', _.bind(this.onMathCategoryClick, this, false)); this.btnsCategory[1].on('click', _.bind(this.onRecCategoryClick, this, false)); + this.btnsCategory[2] && this.btnsCategory[2].on('click', _.bind(this.updateFooterButtons, this, true)); this.afterRender(); }, @@ -324,6 +384,7 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', var value = this.getActiveCategory(); if (value==0) this.onMathCategoryClick(true); else if (value==1) this.onRecCategoryClick(true); + this.updateFooterButtons(value>1); }, close: function() { @@ -333,6 +394,8 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', }, onMathCategoryClick: function(delay) { + this.updateFooterButtons(false); + var me = this; _.delay(function(){ $('input', me.inputReplace.cmpEl).select().focus(); @@ -592,6 +655,8 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', }, onRecCategoryClick: function(delay) { + this.updateFooterButtons(false); + var me = this; _.delay(function(){ $('input', me.inputRecFind.cmpEl).select().focus(); @@ -683,6 +748,12 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', this.btnAddRec.setDisabled(!!rec || !value); }, + updateFooterButtons: function(apply) { + this.applyButtons.toggleClass('hidden', !apply); + this.closeButtons.toggleClass('hidden', apply); + }, + + textTitle: 'AutoCorrect', textMathCorrect: 'Math AutoCorrect', textReplace: 'Replace', @@ -699,7 +770,14 @@ define([ 'text!common/main/lib/template/AutoCorrectDialog.template', textRecognized: 'Recognized Functions', textRecognizedDesc: 'The following expressions are recognized math expressions. They will not be automatically italicized.', textWarnAddRec: 'Recognized functions must contain only the letters A through Z, uppercase or lowercase.', - textWarnResetRec: 'Any expression you added will be removed and the removed ones will be restored. Do you want to continue?' + textWarnResetRec: 'Any expression you added will be removed and the removed ones will be restored. Do you want to continue?', + textAutoFormat: 'AutoFormat As You Type', + textReplaceText: 'Replace As You Type', + textApplyText: 'Apply As You Type', + textQuotes: '"Straight quotes" with "smart quotes"', + textHyphens: 'Hyphens (--) with dash (—)', + textBulleted: 'Automatic bulleted lists', + textNumbered: 'Automatic numbered lists' }, Common.Views.AutoCorrectDialog || {})) }); diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index b917ed4fc..801536acc 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -1056,24 +1056,7 @@ define([ Common.Utils.InternalSettings.set("de-settings-paste-button", parseInt(value)); me.api.asc_setVisiblePasteButton(!!parseInt(value)); - // autocorrection - value = Common.localStorage.getItem("de-settings-math-correct-add"); - Common.Utils.InternalSettings.set("de-settings-math-correct-add", value); - var arrAdd = value ? JSON.parse(value) : []; - value = Common.localStorage.getItem("de-settings-math-correct-rem"); - Common.Utils.InternalSettings.set("de-settings-math-correct-rem", value); - var arrRem = value ? JSON.parse(value) : []; - value = Common.localStorage.getBool("de-settings-math-correct-replace-type", true); // replace on type - Common.Utils.InternalSettings.set("de-settings-math-correct-replace-type", value); - me.api.asc_refreshOnStartAutoCorrectMathSymbols(arrRem, arrAdd, value); - - value = Common.localStorage.getItem("de-settings-rec-functions-add"); - Common.Utils.InternalSettings.set("de-settings-rec-functions-add", value); - arrAdd = value ? JSON.parse(value) : []; - value = Common.localStorage.getItem("de-settings-rec-functions-rem"); - Common.Utils.InternalSettings.set("de-settings-rec-functions-rem", value); - arrRem = value ? JSON.parse(value) : []; - me.api.asc_refreshOnStartAutoCorrectMathFunctions(arrRem, arrAdd); + me.loadAutoCorrectSettings(); if (me.needToUpdateVersion) Common.NotificationCenter.trigger('api:disconnect'); @@ -2308,6 +2291,44 @@ define([ } }, + loadAutoCorrectSettings: function() { + // autocorrection + var me = this; + var value = Common.localStorage.getItem("de-settings-math-correct-add"); + Common.Utils.InternalSettings.set("de-settings-math-correct-add", value); + var arrAdd = value ? JSON.parse(value) : []; + value = Common.localStorage.getItem("de-settings-math-correct-rem"); + Common.Utils.InternalSettings.set("de-settings-math-correct-rem", value); + var arrRem = value ? JSON.parse(value) : []; + value = Common.localStorage.getBool("de-settings-math-correct-replace-type", true); // replace on type + Common.Utils.InternalSettings.set("de-settings-math-correct-replace-type", value); + me.api.asc_refreshOnStartAutoCorrectMathSymbols(arrRem, arrAdd, value); + + value = Common.localStorage.getItem("de-settings-rec-functions-add"); + Common.Utils.InternalSettings.set("de-settings-rec-functions-add", value); + arrAdd = value ? JSON.parse(value) : []; + value = Common.localStorage.getItem("de-settings-rec-functions-rem"); + Common.Utils.InternalSettings.set("de-settings-rec-functions-rem", value); + arrRem = value ? JSON.parse(value) : []; + me.api.asc_refreshOnStartAutoCorrectMathFunctions(arrRem, arrAdd); + + value = Common.localStorage.getBool("de-settings-autoformat-bulleted", true); + Common.Utils.InternalSettings.set("de-settings-autoformat-bulleted", value); + me.api.asc_SetAutomaticBulletedLists(value); + + value = Common.localStorage.getBool("de-settings-autoformat-numbered", true); + Common.Utils.InternalSettings.set("de-settings-autoformat-numbered", value); + me.api.asc_SetAutomaticNumberedLists(value); + + value = Common.localStorage.getBool("de-settings-autoformat-smart-quotes", true); + Common.Utils.InternalSettings.set("de-settings-autoformat-smart-quotes", value); + me.api.asc_SetAutoCorrectSmartQuotes(value); + + value = Common.localStorage.getBool("de-settings-autoformat-hyphens", true); + Common.Utils.InternalSettings.set("de-settings-autoformat-hyphens", value); + me.api.asc_SetAutoCorrectHyphensWithDash(value); + }, + leavePageText: 'You have unsaved changes in this document. Click \'Stay on this Page\' then \'Save\' to save them. Click \'Leave this Page\' to discard all the unsaved changes.', criticalErrorTitle: 'Error', notcriticalErrorTitle: 'Warning', diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index 033c8bd7c..c71aca6f3 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -174,6 +174,13 @@ "Common.Views.AutoCorrectDialog.textRecognizedDesc": "The following expressions are recognized math expressions. They will not be automatically italicized.", "Common.Views.AutoCorrectDialog.textWarnAddRec": "Recognized functions must contain only the letters A through Z, uppercase or lowercase.", "Common.Views.AutoCorrectDialog.textWarnResetRec": "Any expression you added will be removed and the removed ones will be restored. Do you want to continue?", + "Common.Views.AutoCorrectDialog.textAutoFormat": "AutoFormat As You Type", + "Common.Views.AutoCorrectDialog.textReplaceText": "Replace As You Type", + "Common.Views.AutoCorrectDialog.textApplyText": "Apply As You Type", + "Common.Views.AutoCorrectDialog.textQuotes": "\"Straight quotes\" with \"smart quotes\"", + "Common.Views.AutoCorrectDialog.textHyphens": "Hyphens (--) with dash (—)", + "Common.Views.AutoCorrectDialog.textBulleted": "Automatic bulleted lists", + "Common.Views.AutoCorrectDialog.textNumbered": "Automatic numbered lists", "Common.Views.Chat.textSend": "Send", "Common.Views.Comments.textAdd": "Add", "Common.Views.Comments.textAddComment": "Add Comment",