From ded99f23fbd5da72770ea30e07c86bb683cad41a Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 2 Dec 2019 14:47:02 +0300 Subject: [PATCH] [DE] Change settings for check box content control --- .../main/lib/view/ListSettingsDialog.js | 2 +- .../template/ControlSettingsDialog.template | 12 ++--- .../main/app/view/ControlSettingsDialog.js | 45 ++++++------------- apps/documenteditor/main/locale/en.json | 1 + 4 files changed, 19 insertions(+), 41 deletions(-) diff --git a/apps/common/main/lib/view/ListSettingsDialog.js b/apps/common/main/lib/view/ListSettingsDialog.js index 8f783c8d0..a48cba60b 100644 --- a/apps/common/main/lib/view/ListSettingsDialog.js +++ b/apps/common/main/lib/view/ListSettingsDialog.js @@ -174,7 +174,7 @@ define([ hint: this.tipChange }); this.btnEdit.on('click', _.bind(this.onEditBullet, this)); - this.btnEdit.cmpEl.css({'font-size': '12px'}); + this.btnEdit.cmpEl.css({'font-size': '16px', 'line-height': '16px'}); this.afterRender(); }, diff --git a/apps/documenteditor/main/app/template/ControlSettingsDialog.template b/apps/documenteditor/main/app/template/ControlSettingsDialog.template index 70df12159..23880858e 100644 --- a/apps/documenteditor/main/app/template/ControlSettingsDialog.template +++ b/apps/documenteditor/main/app/template/ControlSettingsDialog.template @@ -123,16 +123,13 @@
- +
- @@ -140,10 +137,7 @@ -
-
- 		- +
-
- 		- +
diff --git a/apps/documenteditor/main/app/view/ControlSettingsDialog.js b/apps/documenteditor/main/app/view/ControlSettingsDialog.js index 99d10656c..a2f55ec33 100644 --- a/apps/documenteditor/main/app/view/ControlSettingsDialog.js +++ b/apps/documenteditor/main/app/view/ControlSettingsDialog.js @@ -238,36 +238,18 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', }); // Check Box - this.txtChecked = new Common.UI.InputField({ - el : $('#control-settings-input-checked'), - allowBlank : true, - validateOnChange: false, - validateOnBlur: false, - style : 'width: 30px;', - value : '' - }); - this.txtChecked._input.attr('disabled', true); - this.txtChecked._input.css({'text-align': 'center', 'font-size': '16px'}); - - this.txtUnchecked = new Common.UI.InputField({ - el : $('#control-settings-input-unchecked'), - allowBlank : true, - validateOnChange: false, - validateOnBlur: false, - style : 'width: 30px;', - value : '' - }); - this.txtUnchecked._input.attr('disabled', true); - this.txtUnchecked._input.css({'text-align': 'center', 'font-size': '16px'}); - this.btnEditChecked = new Common.UI.Button({ - el: $('#control-settings-btn-checked-edit') + el: $('#control-settings-btn-checked-edit'), + hint: this.tipChange }); + this.btnEditChecked.cmpEl.css({'font-size': '16px', 'line-height': '16px'}); this.btnEditChecked.on('click', _.bind(this.onEditCheckbox, this, true)); this.btnEditUnchecked = new Common.UI.Button({ - el: $('#control-settings-btn-unchecked-edit') + el: $('#control-settings-btn-unchecked-edit'), + hint: this.tipChange }); + this.btnEditUnchecked.cmpEl.css({'font-size': '16px', 'line-height': '16px'}); this.btnEditUnchecked.on('click', _.bind(this.onEditCheckbox, this, false)); this.afterRender(); @@ -388,14 +370,14 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', if (specProps) { var code = specProps.get_CheckedSymbol(), font = specProps.get_CheckedFont(); - font && this.txtChecked.cmpEl.css('font-family', font); - code && this.txtChecked.setValue(String.fromCharCode(code)); + font && this.btnEditChecked.cmpEl.css('font-family', font); + code && this.btnEditChecked.setCaption(String.fromCharCode(code)); this.checkedBox = {code: code, font: font}; code = specProps.get_UncheckedSymbol(); font = specProps.get_UncheckedFont(); - font && this.txtUnchecked.cmpEl.css('font-family', font); - code && this.txtUnchecked.setValue(String.fromCharCode(code)); + font && this.btnEditUnchecked.cmpEl.css('font-family', font); + code && this.btnEditUnchecked.setCaption(String.fromCharCode(code)); this.uncheckedBox = {code: code, font: font}; } } @@ -599,14 +581,14 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', if (this.api) { var me = this, props = (checked) ? me.checkedBox : me.uncheckedBox, - cmp = (checked) ? me.txtChecked : me.txtUnchecked, + cmp = (checked) ? me.btnEditChecked : me.btnEditUnchecked, handler = function(dlg, result, settings) { if (result == 'ok') { props.changed = true; props.code = settings.code; props.font = settings.font; props.font && cmp.cmpEl.css('font-family', props.font); - settings.symbol && cmp.setValue(settings.symbol); + settings.symbol && cmp.setCaption(settings.symbol); } }, win = new Common.Views.SymbolTableDialog({ @@ -657,7 +639,8 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template', textFormat: 'Display the date like this', textCheckbox: 'Check box', textChecked: 'Checked symbol', - textUnchecked: 'Unchecked symbol' + textUnchecked: 'Unchecked symbol', + tipChange: 'Change symbol' }, DE.Views.ControlSettingsDialog || {})) }); \ No newline at end of file diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index bc6102268..bc1142511 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -1160,6 +1160,7 @@ "DE.Views.ControlSettingsDialog.textCheckbox": "Check box", "DE.Views.ControlSettingsDialog.textChecked": "Checked symbol", "DE.Views.ControlSettingsDialog.textUnchecked": "Unchecked symbol", + "DE.Views.ControlSettingsDialog.tipChange": "Change symbol", "DE.Views.CustomColumnsDialog.textColumns": "Number of columns", "DE.Views.CustomColumnsDialog.textSeparator": "Column divider", "DE.Views.CustomColumnsDialog.textSpacing": "Spacing between columns",