From bbc44f9f56f16ec51dcbae66c65bb19bd1d235d4 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 6 Jul 2022 17:10:35 -0400
Subject: [PATCH] Afform - Close popup dialog after submitting

---
 ext/afform/core/ang/af/afForm.component.js | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ext/afform/core/ang/af/afForm.component.js b/ext/afform/core/ang/af/afForm.component.js
index 4a2f44ee59..7abbf65a59 100644
--- a/ext/afform/core/ang/af/afForm.component.js
+++ b/ext/afform/core/ang/af/afForm.component.js
@@ -68,14 +68,22 @@
 
       // Called after form is submitted and files are uploaded
       function postProcess() {
-        var metaData = ctrl.getFormMeta();
+        var metaData = ctrl.getFormMeta(),
+          dialog = $element.closest('.ui-dialog-content');
 
         $element.trigger('crmFormSuccess', {
           afform: metaData,
           data: data
         });
 
-        if (metaData.redirect) {
+        status.resolve();
+        $element.unblock();
+
+        if (dialog.length) {
+          dialog.dialog('close');
+        }
+
+        else if (metaData.redirect) {
           var url = metaData.redirect;
           if (url.indexOf('civicrm/') === 0) {
             url = CRM.url(url);
@@ -84,8 +92,6 @@
           }
           $window.location.href = url;
         }
-        status.resolve();
-        $element.unblock();
       }
 
       this.submit = function() {
-- 
2.25.1