CRM.confirm - re-use adjustDialogDefaults function

diff --git a/js/Common.js b/js/Common.js
index a03074f495e498d6f06a6f265fe671b52515f46d..737bc89fa0523114b3d1b43c9f70c329dc743716 100644 (file)
--- a/js/Common.js
+++ b/js/Common.js
@@ -1008,7 +1008,7 @@ CRM.strings = CRM.strings || {};
       message: ts('Are you sure you want to continue?'),
       url: null,
       width: 'auto',
-      modal: true,
+      height: 'auto',
       resizable: false,
       dialogClass: 'crm-container crm-confirm',
       close: function () {
@@ -1019,7 +1019,12 @@ CRM.strings = CRM.strings || {};
         yes: ts('Continue')
       }
     };
+    if (options && options.url) {
+      settings.resizable = true;
+      settings.height = '50%';
+    }
     $.extend(settings, ($.isFunction(options) ? arguments[1] : options) || {});
+    settings = CRM.utils.adjustDialogDefaults(settings);
     if (!settings.buttons && $.isPlainObject(settings.options)) {
       $.each(settings.options, function(op, label) {
         buttons.push({

diff --git a/templates/CRM/Core/Form/RecurringEntity.tpl b/templates/CRM/Core/Form/RecurringEntity.tpl
index c7b515a759f4814460383db3aa919d5dcba800e4..2e334ba174a64313bc17c7fae9cb878c1cb28dff 100644 (file)
--- a/templates/CRM/Core/Form/RecurringEntity.tpl
+++ b/templates/CRM/Core/Form/RecurringEntity.tpl
@@ -166,8 +166,7 @@
           });\r
       });\r
 \r
-    //If there are changes in repeat configuration, enable save button\r
-    //Dialog for preview repeat Configuration dates\r
+    // Dialog for preview repeat Configuration dates\r
     function previewDialog() {\r
       // Set default value for start date on activity forms before generating preview\r
       if (!$('#repetition_start_date', $form).val() && $('#activity_date_time', $form).val()) {\r
@@ -176,13 +175,11 @@
           .next().val($('#activity_date_time', $form).next().val())\r
           .siblings('.hasTimeEntry').val($('#activity_date_time', $form).siblings('.hasTimeEntry').val());\r
       }\r
-      var payload = $form.serialize() + '{/literal}&entity_table={$entityTable}&entity_id={$currentEntityId}{literal}',\r
-        settings = CRM.utils.adjustDialogDefaults({\r
-          width: '50%',\r
-          url: CRM.url("civicrm/recurringentity/preview", payload)\r
-        });\r
-      CRM.confirm(settings)\r
-        .on('crmConfirm:yes', function() {\r
+      var payload = $form.serialize() + '{/literal}&entity_table={$entityTable}&entity_id={$currentEntityId}{literal}';\r
+      CRM.confirm({\r
+        width: '50%',\r
+        url: CRM.url("civicrm/recurringentity/preview", payload)\r
+      }).on('crmConfirm:yes', function() {\r
           $form.submit();\r
         });\r
     }\r