extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 01:52:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Etemplate - make sure nextmatch action popups get properly closed

Browse Source
This commit is contained in:
nathangray 2017-12-18 14:51:07 -07:00
parent e2191bfec2
commit e491f4112a
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/js/etemplate/et2_extension_nextmatch_actions.js
View File

@ -420,6 +420,10 @@ function nm_open_popup(_action, _selected)
var d_buttons = [];
var action = _action;
popup.show();
var close_function = function()
{
dialog_parent.append(dialog);
};
jQuery('button:visible',popup).each(function(index) {
var but = jQuery(this);
if(but.attr("id"))
@ -435,9 +439,11 @@ function nm_open_popup(_action, _selected)
jQuery(this).dialog("close");
nm_popup_action = action;
button.onclick.apply(button, e.currentTarget);
close_function();
} : function(e) {
jQuery(this).dialog("close");
nm_popup_action = null;
close_function();
}
};
if(button && button.options && button.options.image)
@ -448,9 +454,8 @@ function nm_open_popup(_action, _selected)
});
popup.hide();
var _dialog = et2_dialog.show_dialog(function() {
dialog_parent.append(dialog);
},
var _dialog = et2_dialog.show_dialog(
close_function,
'',
jQuery('.promptheader',popup).text(),
{},