From b9efaec47cb1249a5e28a35aec1fb8438ecb0247 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 12 Oct 2020 15:07:35 +0300 Subject: [PATCH] Fix modalmanager data-ajaxForm comparison --- .../bootstrap/modal-manager.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js index cc4122a373..3e60d5f9c2 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/bootstrap/modal-manager.js @@ -1,7 +1,3 @@ -/** - * TODO: Document & prepare typescript definitions - * TODO: Refactor & test more - */ var abp = abp || {}; $.validator.defaults.ignore = ''; //TODO: Would be better if we can apply only for the form we are working on! Also this should be decided by the form itself! @@ -12,7 +8,7 @@ $.validator.defaults.ignore = ''; //TODO: Would be better if we can apply only f abp.ModalManager = (function () { - var CallbackList = function () { //TODO: To a seperated file + var CallbackList = function () { var _callbacks = []; return { @@ -67,12 +63,11 @@ $.validator.defaults.ignore = ''; //TODO: Would be better if we can apply only f _$modal = _$modalContainer.find('.modal'); _$form = _$modalContainer.find('form'); if (_$form.length) { - //TODO: data-ajaxForm comparison seems wrong! - if (_$form.attr('data-ajaxForm') === undefined || _$form.attr('data-ajaxForm') === false) { + if (_$form.attr('data-ajaxForm') !== 'false') { _$form.abpAjaxForm(); } - if (_$form.attr('data-check-form-on-close') === undefined || _$form.attr('data-check-form-on-close') != 'false') { + if (_$form.attr('data-check-form-on-close') !== 'false') { _$form.needConfirmationOnUnsavedClose(_$modal); }