Joomla popup alert/confirm handle cancel

Fedik · Mar 12, 2023 · 6923750 · 6923750
1 parent 25b6b16
commit 6923750
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/build/media_source/system/js/joomla-popup.w-c.es6.js b/build/media_source/system/js/joomla-popup.w-c.es6.js
@@ -269,12 +269,12 @@ class JoomlaPopup extends HTMLElement {
             }
             return response.text();
           }).then((text) => {
-            this.popupTmplB.insertAdjacentHTML('afterbegin', text);
-            this.popupContentElement = this.popupTmplB;
-            onLoad();
-          }).catch((error) => {
-            throw error;
-          });
+          this.popupTmplB.insertAdjacentHTML('afterbegin', text);
+          this.popupContentElement = this.popupTmplB;
+          onLoad();
+        }).catch((error) => {
+          throw error;
+        });
         break;
       }
 
@@ -368,10 +368,10 @@ class JoomlaPopup extends HTMLElement {
         label: 'Okay',
         onClick: () => {
           popup.close();
-          resolve();
         },
       }];
       popup.classList.add('joomla-popup-alert');
+      popup.addEventListener('joomla-popup:close', () => resolve());
       popup.show();
     });
   }
@@ -384,27 +384,29 @@ class JoomlaPopup extends HTMLElement {
    */
   static confirm(message) {
     return new Promise((resolve) => {
+      let result = false;
       const popup = new this();
       popup.popupType = 'inline';
       popup.popupContent = message;
       popup.popupButtons = [
         {
           label: 'Yes',
           onClick: () => {
+            result = true;
             popup.close();
-            resolve(true);
           },
         },
         {
           label: 'No',
           onClick: () => {
+            result = false
             popup.close();
-            resolve(false);
           },
           className: 'button btn btn-outline-primary',
         },
       ];
       popup.classList.add('joomla-popup-confirm');
+      popup.addEventListener('joomla-popup:close', () => resolve(result));
       popup.show();
     });
   }