extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-10 07:58:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix up nm_action open_popup to match et2 unique ID changes

Browse Source
This commit is contained in:
Nathan Gray 2013-08-20 22:23:18 +00:00
parent dca0c40418
commit 17e8d00054
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etemplate/js/et2_extension_nextmatch_actions.js
View File

@ -254,7 +254,8 @@ var nm_popup_action, nm_popup_ids = null;
*/ */
function nm_open_popup(_action, _ids) function nm_open_popup(_action, _ids)
{ {
var popup = jQuery("#"+_action.id+"_popup").first() || jQuery("[id*='" + _action.id + "_popup']").first(); // Find the popup div
var popup = jQuery("#"+(_action.data.nextmatch.getInstanceManager().uniqueId||"") + "_"+_action.id+"_popup").first() || jQuery("[id*='" + _action.id + "_popup']").first();
if (popup) { if (popup) {
nm_popup_action = _action; nm_popup_action = _action;
if(_ids.length && typeof _ids[0] == 'object') if(_ids.length && typeof _ids[0] == 'object')
@ -290,15 +291,21 @@ function nm_open_popup(_action, _ids)
} }
if(dialog.length == 1) if(dialog.length == 1)
{ {
// Set up the buttons
var dialog_parent = dialog.parent(); var dialog_parent = dialog.parent();
var d_buttons = []; var d_buttons = [];
var action = _action; var action = _action;
jQuery('button',popup).each(function(index) { jQuery('button',popup).each(function(index) {
var but = jQuery(this); var but = jQuery(this);
var button = nm_popup_action.data.nextmatch.getRoot().getWidgetById(but.attr("id")); if(but.attr("id"))
{
// Find the associated widget
var widget_id = but.attr("id").replace(_action.data.nextmatch.getInstanceManager().uniqueId+'_', '');
var button = nm_popup_action.data.nextmatch.getRoot().getWidgetById(widget_id);
}
d_buttons.push({ d_buttons.push({
text: but.text(), text: but.text(),
click: button.onclick ? function(e) { click: button && button.onclick ? function(e) {
dialog.dialog("close"); dialog.dialog("close");
nm_popup_action = action; nm_popup_action = action;
button.onclick.apply(button, e.currentTarget); button.onclick.apply(button, e.currentTarget);
@ -338,7 +345,9 @@ function nm_submit_popup(button)
} }
else if (nm_popup_action.data.nextmatch) else if (nm_popup_action.data.nextmatch)
{ {
nm_popup_action.data.nextmatch.getRoot().getWidgetById(button.id).clicked = true; // Find the associated widget
var widget_id = $j(button).attr("id").replace(nm_popup_action.data.nextmatch.getInstanceManager().uniqueId+'_', '');
nm_popup_action.data.nextmatch.getRoot().getWidgetById(widget_id).clicked = true;
} }
// Mangle senders to get IDs where nm_action() wants them // Mangle senders to get IDs where nm_action() wants them