diff options
author | Frédéric Guillot <fred@kanboard.net> | 2018-10-23 15:12:44 -0700 |
---|---|---|
committer | Frédéric Guillot <fred@kanboard.net> | 2018-10-23 15:12:44 -0700 |
commit | 5a2836bf39e76568731117df3d05c9345dee9406 (patch) | |
tree | 4c2c88e9dd99fafbcfc98953c16a8e8d5957a316 /assets/js/core | |
parent | 2deb6cc917bdcfa503a892491532b94bef19d1e1 (diff) |
Revert "Easier closing of dialogs" (introduces regression on date time picker)
This reverts commit 71630aaa77b518d3d0165f772251f09cc249f015.
Diffstat (limited to 'assets/js/core')
-rw-r--r-- | assets/js/core/modal.js | 40 |
1 files changed, 3 insertions, 37 deletions
diff --git a/assets/js/core/modal.js b/assets/js/core/modal.js index dc656efa..e7f2c2ff 100644 --- a/assets/js/core/modal.js +++ b/assets/js/core/modal.js @@ -1,42 +1,18 @@ (function () { var isOpen = false; - var isFormDirty = false; - - function closeIfDirty() { - if (isFormDirty == false) { - return true; - } - - return window.confirm($("body").data("js-modal-close-msg").replace(/\\n/g,"\n")); - } function onOverlayClick(e) { if (e.target.matches('#modal-overlay')) { - if (closeIfDirty()) { - e.stopPropagation(); - e.preventDefault(); - destroy(); - } + e.stopPropagation(); + e.preventDefault(); + destroy(); } } - function onBeforeUnload(e) { - // Cancel the event as stated by the standard. - e.preventDefault(); - - // Chrome requires returnValue to be set. - e.returnValue = ''; - } - function onCloseButtonClick() { KB.trigger('modal.close'); } - function onFormChange() { - isFormDirty = true; - window.addEventListener('beforeunload', onBeforeUnload, false); - } - function onFormSubmit() { KB.trigger('modal.loading'); submitForm(); @@ -75,7 +51,6 @@ function afterRendering() { var formElement = KB.find('#modal-content form'); if (formElement) { - formElement.on('change', onFormChange, false); formElement.on('submit', onFormSubmit, false); } @@ -90,13 +65,6 @@ _KB.tagAutoComplete(); _KB.get('Task').onPopoverOpened(); - if (formElement) { - $('.form-date').datepicker('option', 'onSelect', onFormChange); - $('.form-datetime').datepicker('option', 'onSelect', onFormChange); - $(".color-picker").on('change', onFormChange); - $(".tag-autocomplete").on('change', onFormChange); - } - KB.trigger('modal.afterRender'); } @@ -154,8 +122,6 @@ function destroy() { isOpen = false; - isFormDirty = false; - window.removeEventListener('beforeunload', onBeforeUnload, false); var overlayElement = KB.find('#modal-overlay'); if (overlayElement) { |