Pārlūkot izejas kodu

Fire callback also on pure closing of prompt dialog

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
tags/v11.0RC2
Morris Jobke pirms 7 gadiem
vecāks
revīzija
ec52286a0f
Revīzijas autora e-pasta adrese nav piesaistīta nevienam kontam
1 mainītis faili ar 15 papildinājumiem un 1 dzēšanām
  1. 15
    1
      core/js/oc-dialogs.js

+ 15
- 1
core/js/oc-dialogs.js Parādīt failu

@@ -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++;

Notiek ielāde…
Atcelt
Saglabāt