upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #2582 from nextcloud/callback-alos-on-close

Browse source 
Fire callback also on pure closing of prompt dialog
This commit is contained in:
Lukas Reschke 2016-12-09 13:44:53 +01:00 committed by GitHub
commit 49473dee85
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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