Merge remote branch 'canonical/master' into merge-forward

[civicrm-core.git] / templates / CRM / Contribute / Form / Contribution.tpl

diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index a8d4ce4dc8331d6da81e636d7bcb351c43c1c878..57ec505d76c7acc514563694cb52ca81eb9828b2 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -204,7 +204,7 @@
                 {if $hideCalendar neq true}
                   {include file="CRM/common/jcalendar.tpl" elementName=cancel_date}
                 {else}
-                  {$form.cancel_date.html|crmDate}
+                  {$form.cancel_date.value|crmDate}
                 {/if}
               </td>
             </tr>
@@ -401,7 +401,7 @@
     {if $context eq 'standalone' and $outBound_option != 2 }
       {literal}
       CRM.$(function($) {
-        cj("#contact_1").blur( function( ) {
+        cj("#contact_id").change( function( ) {
           checkEmail( );
         });
         checkEmail( );
@@ -410,7 +410,7 @@
       });
 
       function checkEmail( ) {
-        var contactID = cj("input[name='contact_select_id[1]']").val();
+        var contactID = cj("#contact_id").val();
         if (contactID) {
           var postUrl = "{/literal}{crmURL p='civicrm/ajax/checkemail' h=0}{literal}";
           cj.post( postUrl, {contact_id: contactID},