X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=templates%2FCRM%2Fcommon%2Fjcalendar.tpl;h=b4e25f3d0dbd02e30298f4fdd47330ee1aa42daf;hb=4e56e743a9691a785eaf97590e68388c671e0a49;hp=75a3445ef580ef365c205c93b6225e1fada115d5;hpb=b67022d16d25106799f57d39e9301b3f00af619c;p=civicrm-core.git

diff --git a/templates/CRM/common/jcalendar.tpl b/templates/CRM/common/jcalendar.tpl
index 75a3445ef5..b4e25f3d0d 100644
--- a/templates/CRM/common/jcalendar.tpl
+++ b/templates/CRM/common/jcalendar.tpl
@@ -43,7 +43,9 @@
         {$form.$blockSection.$blockId.$tElement.html|crmAddClass:six}
     {/if}
 {else}
-    {assign var='elementId'   value=$form.$elementName.id}
+    {if !$elementId}
+      {assign var='elementId'   value=$form.$elementName.id}
+    {/if}
     {assign var="timeElement" value=$elementName|cat:'_time'}
     {$form.$elementName.html}
 {/if}
@@ -131,6 +133,8 @@
       // format date according to display field
       displayDateValue = cj.datepicker.formatDate( date_format, displayDateValue );
       cj( element_date).val( displayDateValue );
+      //support unsaved-changes warning: CRM-14353
+      cj( element_date).data('crm-initial-value', displayDateValue);
 
       cj(element_date).click( function( ) {
           hideYear( this );