From 26df36312b206c16499255ae211792ea72bbc297 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Wed, 7 Aug 2019 11:00:23 +0300
Subject: [PATCH] fixed sweetalert escape bug in modal unsaved changes

---
 .../jquery/jquery-extensions.js                             | 2 +-
 .../sweetalert/abp-sweetalert.js                            | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js
index b3fa839d10..44c2bdad27 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js
@@ -160,7 +160,7 @@
                             formSaved = true;
                             $modal.modal('hide');
                         }
-                    });
+                    }, false);
             }
         });
 
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js
index c96f836f0d..0ed8460966 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js
@@ -73,17 +73,21 @@
         return showMessage('error', message, title);
     };
 
-    abp.message.confirm = function (message, titleOrCallback, callback) {
+    abp.message.confirm = function (message, titleOrCallback, callback, closeOnEsc) {
+
         var userOpts = {
             text: message
         };
 
         if ($.isFunction(titleOrCallback)) {
+            closeOnEsc = callback;
             callback = titleOrCallback;
         } else if (titleOrCallback) {
             userOpts.title = titleOrCallback;
         };
 
+        userOpts.closeOnEsc = closeOnEsc;
+
         var opts = $.extend(
             {},
             abp.libs.sweetAlert.config['default'],