Fix so clicking pushgroup link on contacts list does not load group information page

Added a general way to mark all such links with data-action-link attribute.
pull/6060/head
Aleksander Machniak 7 years ago
parent 36638ec0c2
commit 196ce5d251

@ -666,7 +666,7 @@ is_event_target: function(e)
var target = rcube_event.get_target(e), var target = rcube_event.get_target(e),
tagname = target.tagName.toLowerCase(); tagname = target.tagName.toLowerCase();
return !(target && (tagname == 'input' || tagname == 'img' || (tagname != 'a' && target.onclick))); return !(target && (tagname == 'input' || tagname == 'img' || (tagname != 'a' && target.onclick) || $(target).data('action-link')));
}, },

@ -412,6 +412,7 @@ function rcmail_js_contacts_list($result, $prefix='')
'rel' => $row['ID'], 'rel' => $row['ID'],
'title' => $RCMAIL->gettext('listgroup'), 'title' => $RCMAIL->gettext('listgroup'),
'onclick' => sprintf("return %s.command('pushgroup',{'source':'%s','id':'%s'},this,event)", rcmail_output::JS_OBJECT_NAME, $source_id, $row['CID']), 'onclick' => sprintf("return %s.command('pushgroup',{'source':'%s','id':'%s'},this,event)", rcmail_output::JS_OBJECT_NAME, $source_id, $row['CID']),
'data-action-link' => true,
), '»'); ), '»');
} }
else else

Loading…
Cancel
Save