From a8a8ddac5c239d1832d91ca4fe212e4abb326621 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 3 Mar 2015 18:34:49 -0500
Subject: [PATCH] CRM.confirm - re-use adjustDialogDefaults function

---
 js/Common.js                                |  7 ++++++-
 templates/CRM/Core/Form/RecurringEntity.tpl | 15 ++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

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