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

[PE] Header/Footer: fix applying fixed date/time format. Change primary button

Browse source
This commit is contained in:
Julia Radzhabova 2019-08-01 15:30:22 +03:00
parent 9ee50c2847
commit 70a34e598c
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/presentationeditor/main/app/view/HeaderFooterDialog.js
View file

@ -74,8 +74,8 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
'</div>', '</div>',
'<div class="separator horizontal"/>', '<div class="separator horizontal"/>',
'<div class="footer center">', '<div class="footer center">',
'<button class="btn normal dlg-btn primary" result="ok" style="margin-right: 10px;width: auto; min-width: 86px;">' + me.applyText + '</button>', '<button class="btn normal dlg-btn primary" result="all" style="margin-right: 10px;width: auto; min-width: 86px;">' + me.applyAllText + '</button>',
'<button class="btn normal dlg-btn" result="all" style="margin-right: 10px;width: auto; min-width: 86px;">' + me.applyAllText + '</button>', '<button class="btn normal dlg-btn" result="ok" style="margin-right: 10px;width: auto; min-width: 86px;">' + me.applyText + '</button>',
'<button class="btn normal dlg-btn" result="cancel">' + me.cancelButtonText + '</button>', '<button class="btn normal dlg-btn" result="cancel">' + me.cancelButtonText + '</button>',
'</div>' '</div>'
].join('') ].join('')
@ -216,7 +216,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
this.props.updateView(); this.props.updateView();
}, },
updateFormats: function(lang) { updateFormats: function(lang, format) {
var props = new AscCommonSlide.CAscDateTime(); var props = new AscCommonSlide.CAscDateTime();
props.put_Lang(lang); props.put_Lang(lang);
var data = props.get_DateTimeExamples(), var data = props.get_DateTimeExamples(),
@ -230,7 +230,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
} }
} }
this.cmbFormat.setData(arr); this.cmbFormat.setData(arr);
var format = this.defaultFormats[lang]; format = format || this.defaultFormats[lang];
this.cmbFormat.setValue(format ? format : arr[0].value); this.cmbFormat.setValue(format ? format : arr[0].value);
}, },
@ -267,7 +267,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
item.setDisabled(!val); item.setDisabled(!val);
}); });
var format, var format, fixed,
datetime = slideprops.get_DateTime(), datetime = slideprops.get_DateTime(),
item = this.cmbLang.store.findWhere({value: datetime ? (datetime.get_Lang() || this.lang) : this.lang}); item = this.cmbLang.store.findWhere({value: datetime ? (datetime.get_Lang() || this.lang) : this.lang});
this._originalLang = item ? item.get('value') : 0x0409; this._originalLang = item ? item.get('value') : 0x0409;
@ -276,10 +276,11 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
if (val) { if (val) {
format = datetime.get_DateTime(); format = datetime.get_DateTime();
!format ? this.radioFixed.setValue(true) : this.radioUpdate.setValue(true); !format ? this.radioFixed.setValue(true) : this.radioUpdate.setValue(true);
!format && (this.inputFixed.setValue(datetime.get_CustomDateTime() || '')); !format && (fixed = datetime.get_CustomDateTime() || '');
this.setDateTimeType(!format ? 'fixed' : 'update', null, true); this.setDateTimeType(!format ? 'fixed' : 'update', null, true);
} }
this.updateFormats(this.cmbLang.getValue()); this.updateFormats(this.cmbLang.getValue(), format);
this.inputFixed.setValue((fixed!==undefined) ? fixed : this.cmbFormat.getRawValue());
val = slideprops.get_ShowSlideNum(); val = slideprops.get_ShowSlideNum();
this.chSlide.setValue(val, true); this.chSlide.setValue(val, true);
@ -322,7 +323,7 @@ define(['text!presentationeditor/main/app/template/HeaderFooterDialog.template',
}, },
onPrimary: function() { onPrimary: function() {
this._handleInput('ok'); this._handleInput('all');
return false; return false;
}, },