Merge pull request #20399 from jaapjansma/dev_2624_2

[civicrm-core.git] / js / crm.ajax.js

diff --git a/js/crm.ajax.js b/js/crm.ajax.js
index aabfd28f3aaf6b55edaf3d9d651258039ee65b8f..563e57a6dfbc5611af2c448b91c292faa6d3d165 100644 (file)
--- a/js/crm.ajax.js
+++ b/js/crm.ajax.js
@@ -487,7 +487,7 @@
       if (settings.openInline) {
         settings.autoClose = $el.crmSnippet('isOriginalUrl');
         $(this).off('.openInline').on('click.openInline', settings.openInline, function(e) {
-          if ($(this).is(exclude + ', .crm-popup')) {
+          if ($(this).is(exclude + ', .crm-popup, [target=crm-popup]')) {
             return;
           }
           if ($(this).hasClass('open-inline-noreturn')) {
@@ -594,7 +594,7 @@
 
   $(function($) {
     $('body')
-      .on('click', 'a.crm-popup', CRM.popup)
+      .on('click', 'a.crm-popup, a[target=crm-popup]', CRM.popup)
       // Close unsaved dialog messages
       .on('dialogopen', function(e) {
         $('.alert.unsaved-dialog .ui-notify-cross', '#crm-notification-container').click();