mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

ConfirmationDialogView: Make showCancel an explicit option

Browse source 
Also, don't call resolve/reject callbacks if they weren't provided.

FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-07-12 17:14:22 -07:00
parent 14765599f3
commit aa80cdd74d
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
js/views/confirmation_dialog_view.js
View file

@ -10,6 +10,7 @@
templateName: 'confirmation-dialog',
initialize: function(options) {
this.message = options.message;
this.hideCancel = options.hideCancel;
this.resolve = options.resolve;
this.okText = options.okText || i18n('ok');
@ -27,18 +28,22 @@
render_attributes: function() {
return {
message: this.message,
showCancel: Boolean(this.reject),
showCancel: !this.hideCancel,
cancel: this.cancelText,
ok: this.okText
};
},
ok: function() {
this.remove();
this.resolve();
if (this.resolve) {
this.resolve();
}
},
cancel: function() {
this.remove();
this.reject();
if (this.reject) {
this.reject();
}
},
onKeyup: function(event) {
if (event.key === 'Escape' || event.key === 'Esc') {