Merge pull request #19262 from eileenmcnaughton/recur_test

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

diff --git a/js/crm.ajax.js b/js/crm.ajax.js
index e65bd7b2a22c946265f100899d9b50b24a6b6a5c..757ebef0633562eefce72b077e916af2d5b9f155 100644 (file)
--- a/js/crm.ajax.js
+++ b/js/crm.ajax.js
@@ -498,7 +498,7 @@
         var buttonContainers = '.crm-submit-buttons, .action-link',
           buttons = [],
           added = [];
-        $(buttonContainers, $el).find('input.crm-form-submit, a.button, button').each(function() {
+        $(buttonContainers, $el).find('.crm-form-submit, .crm-form-xbutton, a.button, button').each(function() {
           var $el = $(this),
             label = $el.is('input') ? $el.attr('value') : $el.text(),
             identifier = $el.attr('name') || $el.attr('href');
@@ -522,7 +522,7 @@
         $el.dialog('option', 'buttons', buttons);
       }
       // Allow a button to prevent ajax submit
-      $('input[data-no-ajax-submit=true]').click(function() {
+      $('input[data-no-ajax-submit=true], button[data-no-ajax-submit=true]').click(function() {
         $(this).closest('form').ajaxFormUnbind();
       });
       // For convenience, focus the first field