From ebcb75b12a6504a4afb8a7647f96512b58aa8619 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Fri, 27 Sep 2019 21:29:14 +0200
Subject: [PATCH] client: v1.0.6; Fixed #36 - client: cancel deletion is
 deleting the corresponding item

---
 client/static/js/main.js | 37 +++++++++++++++++--------------------
 client/version.json      |  6 +++---
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/client/static/js/main.js b/client/static/js/main.js
index 3213721..e22f5f9 100644
--- a/client/static/js/main.js
+++ b/client/static/js/main.js
@@ -35,38 +35,22 @@ $(document).ready(function()
 
     $('.button-delete-roadmap').click(function(event)
     {
-        var response = confirm("Do you really want to delete this roadmap?");
-        if(response === true)
-        {
-            header("location: " + this.href);
-        }
+        confirmDelete("Do you really want to delete this roadmap?", this.href, event);
     });
 
     $('.button-delete-milestone').click(function(event)
     {
-        var response = confirm("Do you really want to delete this milestone?");
-        if(response === true)
-        {
-            header("location: " + this.href);
-        }
+        confirmDelete("Do you really want to delete this milestone?", this.href, event);
     });
 
     $('.button-delete-task').click(function(event)
     {
-        var response = confirm("Do you really want to delete this task?");
-        if(response === true)
-        {
-            header("location: " + this.href);
-        }
+        confirmDelete("Do you really want to delete this task?", this.href, event);
     });
 
     $('.button-delete-subtask').click(function(event)
     {
-        var response = confirm("Do you really want to delete this subtask?");
-        if(response === true)
-        {
-            header("location: " + this.href);
-        }
+        confirmDelete("Do you really want to delete this subtask?", this.href, event);
     });
 
     $('#checkbox-done').click(function()
@@ -96,6 +80,19 @@ $(document).ready(function()
     createTrainMap();
 });
 
+function confirmDelete(message, redirectURL, event)
+{
+    var response = confirm(message);
+    if(response === true)
+    {
+        header("location: " + redirectURL);
+    }
+    else
+    {
+        event.preventDefault();
+    }
+}
+
 function isNull(object)
 {
     return object === "" || object === undefined;
diff --git a/client/version.json b/client/version.json
index be24b87..13c0d7c 100644
--- a/client/version.json
+++ b/client/version.json
@@ -1,7 +1,7 @@
 {
     "version": {
-        "name": "v1.0.5",
-        "code": 6,
-        "date": "25.09.19"
+        "name": "v1.0.6",
+        "code": 7,
+        "date": "27.09.19"
     }
 }
\ No newline at end of file
-- 
GitLab