From 47ea29e325ba45706d8d0317fd5287b710855107 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 25 Aug 2014 14:13:03 +0100
Subject: [PATCH] Mailing form and submitOnce fixes

---
 js/Common.js                            |  1 +
 templates/CRM/Mailing/Form/Schedule.tpl | 26 ++++++++++------------
 templates/CRM/SMS/Form/Schedule.tpl     | 29 ++++++++++---------------
 3 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/js/Common.js b/js/Common.js
index 9d4496d724..ef60236c05 100644
--- a/js/Common.js
+++ b/js/Common.js
@@ -155,6 +155,7 @@ function submitOnce(obj, formId, procText) {
   if (obj.value != null) {
     obj.value = procText + " ...";
   }
+  cj(obj).closest('form').attr('data-warn-changes', 'false');
   if (document.getElementById) { // disable submit button for newer browsers
     obj.disabled = true;
     document.getElementById(formId).submit();
diff --git a/templates/CRM/Mailing/Form/Schedule.tpl b/templates/CRM/Mailing/Form/Schedule.tpl
index 64f65c4cd6..a8221d3b3c 100644
--- a/templates/CRM/Mailing/Form/Schedule.tpl
+++ b/templates/CRM/Mailing/Form/Schedule.tpl
@@ -72,19 +72,17 @@
 
 <script type="text/javascript">
 {literal}
-CRM.$(function($) {
-   $('#start_date_display').change( function( ) {
-       if ( $(this).val( ) ) {
-          $('#now').prop('checked', false );
-       }
-   });
-   $('#now').change( function( ) { 
-       if ( $('#now').prop('checked', true ) ) {
-          $('#start_date_display').val( '' );
-          $('#start_date').val( '' );
-          $('#start_date_time').val( '' );
-       }
-   });
-});
+  CRM.$(function($) {
+    $('#start_date_display').change(function() {
+      $('#now').prop('checked', !$(this).val());
+    });
+    $('#now').change(function() {
+      if ($(this).prop('checked')) {
+        $('#start_date_display, #start_date, #start_date_time').val('');
+      } else {
+        $('#start_date_display').focus();
+      }
+    });
+  });
 {/literal}
 </script>
diff --git a/templates/CRM/SMS/Form/Schedule.tpl b/templates/CRM/SMS/Form/Schedule.tpl
index 950db84a3e..59699f27f0 100644
--- a/templates/CRM/SMS/Form/Schedule.tpl
+++ b/templates/CRM/SMS/Form/Schedule.tpl
@@ -69,23 +69,18 @@
 </div>
 
 <script type="text/javascript">
-{if $preview}
-{/if}
-
 {literal}
-CRM.$(function($) {
-   $('#start_date_display').change( function( ) { 
-       if ( $(this).val( ) ) {
-          $('#now').prop('checked', false );
-       }
-   });
-   $('#now').change( function( ) { 
-       if ( $('#now').prop('checked', true ) ) {
-          $('#start_date_display').val( '' );
-          $('#start_date').val( '' );
-          $('#start_date_time').val( '' );
-       }
-   });
-});
+  CRM.$(function($) {
+    $('#start_date_display').change(function() {
+      $('#now').prop('checked', !$(this).val());
+    });
+    $('#now').change(function() {
+      if ($(this).prop('checked')) {
+        $('#start_date_display, #start_date, #start_date_time').val('');
+      } else {
+        $('#start_date_display').focus();
+      }
+    });
+  });
 {/literal}
 </script>
-- 
2.25.1