Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE] Change mailmerge settings

Browse source
This commit is contained in:
Julia Radzhabova 2021-03-30 16:58:46 +03:00
parent 1e18f144c2
commit c0e0d8a058
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/template/MailMerge.template
View file

@ -23,13 +23,11 @@
<tr> <tr>
<td style="padding-bottom: 13px;"> <td style="padding-bottom: 13px;">
<div id="mmerge-switcher-highlight" style="display: inline-block; vertical-align: top;"></div> <div id="mmerge-switcher-highlight" style="display: inline-block; vertical-align: top;"></div>
<label style="margin-left: 5px;"><%= scope.textHighlight %></label>
</td> </td>
</tr> </tr>
<tr> <tr>
<td class="padding-small"> <td class="padding-small">
<div id="mmerge-switcher-preview" style="display: inline-block; vertical-align: top;"></div> <div id="mmerge-switcher-preview" style="display: inline-block; vertical-align: top;"></div>
<label style="margin-left: 5px;"><%= scope.textPreview %></label>
</td> </td>
</tr> </tr>
<tr> <tr>

20
apps/documenteditor/main/app/view/MailMergeSettings.js
View file

@ -41,7 +41,7 @@ define([
'underscore', 'underscore',
'backbone', 'backbone',
'common/main/lib/component/Button', 'common/main/lib/component/Button',
'common/main/lib/component/Switcher', 'common/main/lib/component/CheckBox',
'common/main/lib/view/SaveAsDlg', 'common/main/lib/view/SaveAsDlg',
'common/main/lib/view/SelectFileDlg', 'common/main/lib/view/SelectFileDlg',
'documenteditor/main/app/view/MailMergeEmailDlg' 'documenteditor/main/app/view/MailMergeEmailDlg'
@ -167,14 +167,16 @@ define([
this.lblAddRecipients = $('#mmerge-lbl-add-recipients'); this.lblAddRecipients = $('#mmerge-lbl-add-recipients');
this.chHighlight = new Common.UI.Switcher({ this.chHighlight = new Common.UI.CheckBox({
el: me.$el.find('#mmerge-switcher-highlight'), el: me.$el.find('#mmerge-switcher-highlight'),
labelText: this.textHighlight,
lock: [_set.noFields, _set.lostConnect] lock: [_set.noFields, _set.lostConnect]
}); });
this.chHighlight.on('change', _.bind(this.onCheckHighlightChange, this)); this.chHighlight.on('change', _.bind(this.onCheckHighlightChange, this));
this.chPreview = new Common.UI.Switcher({ this.chPreview = new Common.UI.CheckBox({
el: me.$el.find('#mmerge-switcher-preview'), el: me.$el.find('#mmerge-switcher-preview'),
labelText: this.textPreview,
lock: [_set.noRecipients, _set.lostConnect] lock: [_set.noRecipients, _set.lostConnect]
}); });
this.chPreview.on('change', _.bind(this.onCheckPreviewChange, this)); this.chPreview.on('change', _.bind(this.onCheckPreviewChange, this));
@ -455,13 +457,13 @@ define([
onCheckHighlightChange: function(field, newValue, eOpts) { onCheckHighlightChange: function(field, newValue, eOpts) {
if (this.api) { if (this.api) {
this.api.asc_SetHighlightMailMergeFields(field.getValue()); this.api.asc_SetHighlightMailMergeFields(field.getValue()=='checked');
} }
this.fireEvent('editcomplete', this); this.fireEvent('editcomplete', this);
}, },
onCheckPreviewChange: function(field, newValue, eOpts) { onCheckPreviewChange: function(field, newValue, eOpts) {
var enable_preview = field.getValue(); var enable_preview = field.getValue()=='checked';
var value = parseInt(this.txtFieldNum.getValue()); var value = parseInt(this.txtFieldNum.getValue());
if (this.api) { if (this.api) {
(enable_preview) ? this.api.asc_PreviewMailMergeResult(isNaN(value) ? 0 : value-1) : (enable_preview) ? this.api.asc_PreviewMailMergeResult(isNaN(value) ? 0 : value-1) :
@ -732,7 +734,7 @@ define([
}, },
disableFieldBtns: function(num) { disableFieldBtns: function(num) {
var disabled_cmn = (this._state.recipientsCount<1 || !this.chPreview.getValue()); var disabled_cmn = (this._state.recipientsCount<1 || this.chPreview.getValue()!=='checked');
var disabled = (disabled_cmn || num<1); var disabled = (disabled_cmn || num<1);
if (this.btnFirst.isDisabled() !== disabled) this.btnFirst.setDisabled(disabled); if (this.btnFirst.isDisabled() !== disabled) this.btnFirst.setDisabled(disabled);
if (this.btnPrev.isDisabled() !== disabled) this.btnPrev.setDisabled(disabled); if (this.btnPrev.isDisabled() !== disabled) this.btnPrev.setDisabled(disabled);
@ -746,14 +748,14 @@ define([
}, },
onPreviewMailMergeResult: function(num) { onPreviewMailMergeResult: function(num) {
if (!this.chPreview.getValue()) if (this.chPreview.getValue()!=='checked')
this.chPreview.setValue(true); this.chPreview.setValue(true);
this.disableFieldBtns(num); this.disableFieldBtns(num);
this.disableEditing(true); this.disableEditing(true);
}, },
onEndPreviewMailMergeResult: function() { onEndPreviewMailMergeResult: function() {
if (this.chPreview.getValue()) if (this.chPreview.getValue()=='checked')
this.chPreview.setValue(false); this.chPreview.setValue(false);
this.disableFieldBtns(-1); this.disableFieldBtns(-1);
this.disableEditing(false); this.disableEditing(false);
@ -825,7 +827,7 @@ define([
}, },
disablePreviewMode: function() { disablePreviewMode: function() {
if (this.api && this.chPreview && this.chPreview.getValue()) { if (this.api && this.chPreview && this.chPreview.getValue()=='checked') {
this.api.asc_EndPreviewMailMergeResult(); this.api.asc_EndPreviewMailMergeResult();
} }
}, },