extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 04:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix not working nm_*_popup actions and others, see #60364

Browse Source
This commit is contained in:
Ralf Becker 2021-07-07 09:30:29 +02:00
parent da3f8d8135
commit cf101c8e13
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -412,7 +412,8 @@ export function nm_compare_field(_action, _senders, _target)
// TODO: This code is rather suboptimal! No global variables as this code will // TODO: This code is rather suboptimal! No global variables as this code will
// run in a global context // run in a global context
var nm_popup_action, nm_popup_ids = null; window.nm_popup_action = null;
window.nm_popup_ids = null;
/** /**
* Open popup for a certain action requiring further input * Open popup for a certain action requiring further input
@ -474,7 +475,7 @@ export function nm_open_popup(_action, _selected)
dialog_parent.append(dialog); dialog_parent.append(dialog);
}; };
jQuery('button:visible',popup).each(function(index) { jQuery('button:visible',popup).each(function(index) {
var but = jQuery(window); var but = jQuery(this);
if(but.attr("id")) if(but.attr("id"))
{ {
// Find the associated widget // Find the associated widget
@ -485,13 +486,13 @@ export function nm_open_popup(_action, _selected)
text: but.text(), text: but.text(),
id: widget_id, id: widget_id,
click: button && button.onclick ? function(e) { click: button && button.onclick ? function(e) {
jQuery(window).dialog("close"); jQuery(this).dialog("close");
nm_popup_action = action; nm_popup_action = action;
nm_popup_ids = selected; nm_popup_ids = selected;
button.onclick.apply(button, e.currentTarget); button.onclick.apply(button, e.currentTarget);
close_function(); close_function();
} : function(e) { } : function(e) {
jQuery(window).dialog("close"); jQuery(this).dialog("close");
nm_popup_action = null; nm_popup_action = null;
close_function(); close_function();
} }
@ -525,9 +526,11 @@ export function nm_open_popup(_action, _selected)
/** /**
* Submit a popup action * Submit a popup action
* *
* Must to be global, as it's used as onclick action!
*
* @param {DOMNode} button DOM node of button * @param {DOMNode} button DOM node of button
*/ */
export function nm_submit_popup(button) window.nm_submit_popup = function(button)
{ {
if (nm_popup_action.data.nextmatch) if (nm_popup_action.data.nextmatch)
{ {
@ -558,11 +561,13 @@ export function nm_submit_popup(button)
/** /**
* Hide popup * Hide popup
* *
* Must to be global, as it's used as onclick action!
*
* @param {DOMNode} element * @param {DOMNode} element
* @param {string} div_id * @param {string} div_id
* @returns {Boolean} * @returns {Boolean}
*/ */
export function nm_hide_popup(element, div_id) window.nm_hide_popup = function(element, div_id)
{ {
var prefix = element.id.substring(0,element.id.indexOf('[')); var prefix = element.id.substring(0,element.id.indexOf('['));
var popup = div_id ? document.getElementById(div_id) : jQuery("#"+prefix+"_popup").get(0) || jQuery("[id*='" + prefix + "_popup']").get(0); var popup = div_id ? document.getElementById(div_id) : jQuery("#"+prefix+"_popup").get(0) || jQuery("[id*='" + prefix + "_popup']").get(0);
@ -583,7 +588,7 @@ export function nm_hide_popup(element, div_id)
* @param {egwAction} _action * @param {egwAction} _action
* @param {array} _senders of egwActionObject * @param {array} _senders of egwActionObject
*/ */
export function nm_activate_link(_action, _senders) window.nm_activate_link = function(_action, _senders)
{ {
jQuery(_senders[0].iface.getDOMNode()).find('.et2_clickable:first').trigger('click'); jQuery(_senders[0].iface.getDOMNode()).find('.et2_clickable:first').trigger('click');
} }