Browse Source

fixed sweetalert escape bug in modal unsaved changes

pull/1606/head
Yunus Emre Kalkan 7 years ago
parent
commit
26df36312b
  1. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js
  2. 6
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert/abp-sweetalert.js

2
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);
}
});

6
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'],

Loading…
Cancel
Save