Mailing form and submitOnce fixes

diff --git a/js/Common.js b/js/Common.js
index 9d4496d72480d41e206d90bb5ab9a509df638d2c..ef60236c05015f8596820f0102372a99ffed1af1 100644 (file)
--- 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 64f65c4cd6a71895a29f2a9f447f2bdd93ce800e..a8221d3b3cec48b12f66ac911ddae78fcbddf5aa 100644 (file)
--- 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 950db84a3e36088d5194fd17c43ff9e8ef16ad7d..59699f27f093206ad9a4a6f9035df7b762eb38b5 100644 (file)
--- 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>