Browse Source

Fire callback also on pure closing of prompt dialog

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
tags/v11.0RC2
Morris Jobke 7 years ago
parent
commit
ec52286a0f
No account linked to committer's email address
1 changed files with 15 additions and 1 deletions
  1. 15
    1
      core/js/oc-dialogs.js

+ 15
- 1
core/js/oc-dialogs.js View File

@@ -124,6 +124,14 @@ var OCdialogs = {
modal = false;
}
$('body').append($dlg);

// wrap callback in _.once():
// only call callback once and not twice (button handler and close
// event) but call it for the close event, if ESC or the x is hit
if (callback !== undefined) {
callback = _.once(callback);
}

var buttonlist = [{
text : t('core', 'No'),
click: function () {
@@ -147,7 +155,13 @@ var OCdialogs = {
$(dialogId).ocdialog({
closeOnEscape: true,
modal : modal,
buttons : buttonlist
buttons : buttonlist,
close : function() {
// callback is already fired if Yes/No is clicked directly
if (callback !== undefined) {
callback(false, input.val());
}
}
});
input.focus();
OCdialogs.dialogsCounter++;

Loading…
Cancel
Save