From 959cd2c4e421d22e876cd1d2099c485f971817f9 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Wed, 26 Mar 2025 15:36:48 +0300 Subject: [PATCH] Refactoring --- .../main/app/view/FormatSettingsDialog.js | 48 +++++++------------ apps/pdfeditor/main/locale/en.json | 26 ++++++++++ 2 files changed, 43 insertions(+), 31 deletions(-) diff --git a/apps/pdfeditor/main/app/view/FormatSettingsDialog.js b/apps/pdfeditor/main/app/view/FormatSettingsDialog.js index 46ab4bdd97..2e745cfbff 100644 --- a/apps/pdfeditor/main/app/view/FormatSettingsDialog.js +++ b/apps/pdfeditor/main/app/view/FormatSettingsDialog.js @@ -135,7 +135,7 @@ define([ Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options); - this._state = {DateFormatCustom: '', TimeFormatCustom: '', DateFormat: '', TimeFormat: '', NegStyle: AscPDF.NegativeStyle.BLACK_MINUS}; + this._state = {DateFormatCustom: '', TimeFormatCustom: '', DateFormat: '', TimeFormat: '', NegStyle: AscPDF.NegativeStyle.BLACK_MINUS, Mask: '*', RegExp: '.'}; this.FormatType = AscPDF.FormatType.NONE; }, @@ -287,13 +287,15 @@ define([ this.txtMask = new Common.UI.InputField({ el : $('#format-settings-mask'), allowBlank : true, - validateOnChange: false, + validateOnChange : true, validateOnBlur: false, style : 'width: 100%;', value : '', dataHint : '1', dataHintDirection: 'left', dataHintOffset: 'small' + }).on ('changing', function (input, value) { + me._state[me.FormatType===AscPDF.FormatType.REGULAR ? 'RegExp' : 'Mask'] = value; }); var arr = []; @@ -384,11 +386,14 @@ define([ this.chRed.setValue(val===AscPDF.NegativeStyle.RED_MINUS || val===AscPDF.NegativeStyle.PARENS_RED, true); } } if (this.FormatType===AscPDF.FormatType.REGULAR) { - this.txtMask.setValue(format.asc_getRegExp() || ''); + this._state.RegExp = format.asc_getRegExp() || ''; + this.txtMask.setValue(this._state.RegExp); } if (this.FormatType===AscPDF.FormatType.SPECIAL) { this.cmbSpecial.setValue(this._state.SpecialType, ''); - if (this._state.SpecialType===-1) - this.txtMask.setValue(format.asc_getMask() || ''); + if (this._state.SpecialType===-1) { + this._state.Mask = format.asc_getMask() || ''; + this.txtMask.setValue(this._state.Mask); + } } this.updateFormatExample(); } @@ -448,42 +453,17 @@ define([ this.lblExample.text(str); }, - onDecimalChange: function(field, newValue, oldValue, eOpts){ - // if (this.FormatType===AscPDF.FormatType.NUMBER) - // this.lblExample.text(this.api.asc_getFiledNumberFormatExample(field.getNumberValue(), this.cmbSeparator.getValue(), this._state.NegStyle, - // this.cmbSymbols.getValue() || '', this.cmbLocation.getValue())); - // else if (this.FormatType===AscPDF.FormatType.PERCENTAGE) - // this.lblExample.text(this.api.asc_getFiledPercentFormatExample(field.getNumberValue(), this.cmbSeparator.getValue())); - }, - - onSeparatorSelect: function(combo, record) { - // if (this.FormatType===AscPDF.FormatType.NUMBER) - // this.lblExample.text(this.api.asc_getFiledNumberFormatExample(this.spnDecimal.getNumberValue(), record.value, this._state.NegStyle, - // this.cmbSymbols.getValue() || '', this.cmbLocation.getValue())); - // else if (this.FormatType===AscPDF.FormatType.PERCENTAGE) - // this.lblExample.text(this.api.asc_getFiledPercentFormatExample(this.spnDecimal.getNumberValue(), record.value)); - }, - onSymbolsSelect: function(combo, record) { - // this.lblExample.text(this.api.asc_getFiledNumberFormatExample(this.spnDecimal.getNumberValue(), this.cmbSeparator.getValue(), this._state.NegStyle, - // record.value || '', this.cmbLocation.getValue())); this.cmbLocation.setDisabled(record.value===null); this.updateFormatExample(); }, - onLocationSelect: function(combo, record) { - // this.lblExample.text(this.api.asc_getFiledNumberFormatExample(this.spnDecimal.getNumberValue(), this.cmbSeparator.getValue(), this._state.NegStyle, - // this.cmbSymbols.getValue() || '', record.value)); - }, - onNegativeChange: function(field, newValue, oldValue, eOpts){ var isRed = this.chRed.getValue()==='checked', isParens = this.chParens.getValue()==='checked'; this._state.NegStyle = isRed ? (isParens ? AscPDF.NegativeStyle.PARENS_RED : AscPDF.NegativeStyle.RED_MINUS) : isParens ? AscPDF.NegativeStyle.PARENS_BLACK : AscPDF.NegativeStyle.BLACK_MINUS; this.updateFormatExample(); - // this.lblExample.text(this.api.asc_getFiledNumberFormatExample(this.spnDecimal.getNumberValue(), this.cmbSeparator.getValue(), this._state.NegStyle, - // this.cmbSymbols.getValue() || '', this.cmbLocation.getValue())); }, onDateTimeListSelect: function(listView, itemView, record){ @@ -493,12 +473,13 @@ define([ isCustom && this.inputCustomFormat.setValue(this._state[this.FormatType===AscPDF.FormatType.DATE ? 'DateFormatCustom' : 'TimeFormatCustom']); this._state[this.FormatType===AscPDF.FormatType.DATE ? 'DateFormat' : 'TimeFormat'] = isCustom ? this.inputCustomFormat.getValue() : record.get('value'); this.updateFormatExample(); - // this.lblExample.text(this.api.asc_getFieldDateTimeFormatExample(this._state[this.FormatType===AscPDF.FormatType.DATE ? 'DateFormat' : 'TimeFormat'])); }, onSpecialChanged: function(combo, record) { this._state.SpecialType = record.value; this._maskPanel.toggleClass('hidden', this._state.SpecialType!==-1); + (this._state.SpecialType===-1) && this.txtMask.setValue(this._state.Mask); + this.updateFormatExample(); }, @@ -515,6 +496,11 @@ define([ this._numberPanel.toggleClass('hidden', !isNumber); this._specialPanel.toggleClass('hidden', this.FormatType!==AscPDF.FormatType.SPECIAL); this._maskPanel.toggleClass('hidden', !(this.FormatType===AscPDF.FormatType.REGULAR || this.FormatType===AscPDF.FormatType.SPECIAL && this._state.SpecialType===-1)); + if (this.FormatType===AscPDF.FormatType.REGULAR) + this.txtMask.setValue(this._state.RegExp); + if (this.FormatType===AscPDF.FormatType.SPECIAL && this._state.SpecialType===-1) + this.txtMask.setValue(this._state.Mask); + this._datePanel.toggleClass('hidden', !(this.FormatType===AscPDF.FormatType.DATE || this.FormatType===AscPDF.FormatType.TIME)); if (this.FormatType===AscPDF.FormatType.DATE || this.FormatType===AscPDF.FormatType.TIME) { this.dateTimeList.$el[0].style.height = this.FormatType===AscPDF.FormatType.DATE ? "184px" : "116px"; diff --git a/apps/pdfeditor/main/locale/en.json b/apps/pdfeditor/main/locale/en.json index 52e4158b8f..25ae57bcc6 100644 --- a/apps/pdfeditor/main/locale/en.json +++ b/apps/pdfeditor/main/locale/en.json @@ -1371,6 +1371,32 @@ "PDFE.Views.FileMenuPanels.Settings.txtWorkspace": "Workspace", "PDFE.Views.FileMenuPanels.ViewSaveAs.textDownloadAs": "Download as", "PDFE.Views.FileMenuPanels.ViewSaveCopy.textSaveCopyAs": "Save Copy as", + "PDFE.Views.FormatSettingsDialog.textTitle": "Format Settings", + "PDFE.Views.FormatSettingsDialog.textCategory": "Category", + "PDFE.Views.FormatSettingsDialog.textDecimal": "Decimal places", + "PDFE.Views.FormatSettingsDialog.textSeparator": "Separator style", + "PDFE.Views.FormatSettingsDialog.textSymbol": "Currency symbol", + "PDFE.Views.FormatSettingsDialog.textLocation": "Symbol location", + "PDFE.Views.FormatSettingsDialog.textNegative": "Negative number style", + "PDFE.Views.FormatSettingsDialog.textParens": "Show parentheses", + "PDFE.Views.FormatSettingsDialog.textRed": "Use red text", + "PDFE.Views.FormatSettingsDialog.textFormat": "Format", + "PDFE.Views.FormatSettingsDialog.textReg": "Regular expression", + "PDFE.Views.FormatSettingsDialog.textMask": "Arbitrary Mask", + "PDFE.Views.FormatSettingsDialog.textPhone": "Phone Number", + "PDFE.Views.FormatSettingsDialog.textZipCode": "ZIP Code", + "PDFE.Views.FormatSettingsDialog.textZipCode4": "ZIP Code + 4", + "PDFE.Views.FormatSettingsDialog.textSSN": "Social Security Number", + "PDFE.Views.FormatSettingsDialog.textNumber": "Number", + "PDFE.Views.FormatSettingsDialog.txtCustom": "Custom", + "PDFE.Views.FormatSettingsDialog.textDate": "Date", + "PDFE.Views.FormatSettingsDialog.textTime": "Time", + "PDFE.Views.FormatSettingsDialog.textPercent": "Percentage", + "PDFE.Views.FormatSettingsDialog.textSpecial": "Special", + "PDFE.Views.FormatSettingsDialog.txtSample": "Example:", + "PDFE.Views.FormatSettingsDialog.textNone": "None", + "PDFE.Views.FormatSettingsDialog.textBefore": "Before with space", + "PDFE.Views.FormatSettingsDialog.textAfter": "After with space", "PDFE.Views.FormSettings.textCheckbox": "Checkbox", "PDFE.Views.FormSettings.textCombobox": "Combo box", "PDFE.Views.FormSettings.textDateField": "Date & time field",