From 6d104948cc74b2412dd6e24885f98a367007ad33 Mon Sep 17 00:00:00 2001 From: mikolaj widla Date: Mon, 6 Mar 2023 15:03:06 +0100 Subject: [PATCH] Fixed bug, that dont refresh data after modal closes by clicking in overlay --- .../src/main/resources/static/js/datatransfer.js | 1 - Backend/mocked-services/src/main/resources/static/js/modal.js | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js b/Backend/mocked-services/src/main/resources/static/js/datatransfer.js index d69a399..12222d6 100644 --- a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js +++ b/Backend/mocked-services/src/main/resources/static/js/datatransfer.js @@ -310,7 +310,6 @@ function changeUUID(element){ changeMessage = "success"; } clientUUID = data; - $("#uuid-input").attr("disabled", true); $("#editable").attr("checked", false); uuidChangeModalDisplay(changeMessage); diff --git a/Backend/mocked-services/src/main/resources/static/js/modal.js b/Backend/mocked-services/src/main/resources/static/js/modal.js index f743055..84c4278 100644 --- a/Backend/mocked-services/src/main/resources/static/js/modal.js +++ b/Backend/mocked-services/src/main/resources/static/js/modal.js @@ -74,13 +74,16 @@ function showModal(jmodal){ function hideModal(jmodal){ if(!modalDisplayed) return; + if ($(uuidChangeModal).hasClass('active')) window.location.reload(); overlay.removeClass('active'); jmodal.removeClass('active'); modalDisplayed = false; } btnModalClose.click(closeModals); + overlay.click(closeModals); + dataLossModalNo.click(closeModals); dataLossModalYes.click(dropChangesAndClose);