Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-25-11-27-40

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

diff --git a/templates/CRM/Form/attachmentjs.tpl b/templates/CRM/Form/attachmentjs.tpl
index a3e44e60b112919a072f6fdc135ce1efecb26199..19823c2637440e1ad3758948caf607e432344293 100644 (file)
--- a/templates/CRM/Form/attachmentjs.tpl
+++ b/templates/CRM/Form/attachmentjs.tpl
@@ -1,22 +1,23 @@
 <script type="text/javascript">
 {literal}
-  cj(function($) {
-    $('a.delete-attachment').click(function() {
+  CRM.$(function($) {
+    $('a.delete-attachment').off('.crmAttachments').on('click.crmAttachments', function(e) {
       var $el = $(this),
         $row = $el.closest('.crm-attachment-wrapper'),
         msg = '{/literal}{ts escape="js" 1="%1"}This will immediately delete the file %1. This action cannot be undone.{/ts}{literal}';
-      CRM.confirm(null, {
+      CRM.confirm({
         title: $el.attr('title'),
         message: ts(msg, {1: '<em>' + $el.data('filename') + '</em>'})
-      }).on('crmConfirmYes', function() {
+      }).on('crmConfirm:yes', function() {
         var postUrl = {/literal}"{crmURL p='civicrm/file/delete' h=0 }"{literal};
         var request = $.post(postUrl, $el.data('args'));
         CRM.status({success: '{/literal}{ts escape="js"}Removed{/ts}{literal}'}, request);
         request.done(function() {
+          $el.trigger('crmPopupFormSuccess');
           $row.remove();
         });
       });
-      return false;
+      e.preventDefault();
     });
   });
 {/literal}