Display confirmation box to close task from the board and improve popover listeners

2 files changed, 12 insertions, 24 deletions

diff --git a/assets/js/src/base.js b/assets/js/src/base.js
index f182c8df..d918e54a 100644
--- a/assets/js/src/base.js
+++ b/assets/js/src/base.js
@@ -178,11 +178,6 @@ var Kanboard = (function() {
             // Check the session every 60s
             window.setInterval(Kanboard.CheckSession, 60000);
 
-            $(".popover-subtask-restriction").click(Kanboard.Popover);
-
-            // Image preview for attachments
-            $(".file-popover").click(Kanboard.Popover);
-
             // Keyboard shortcuts
             Mousetrap.bind("mod+enter", function() {
                 $("form").submit();
@@ -207,6 +202,9 @@ var Kanboard = (function() {
 
         InitAfterAjax: function() {
 
+            // Popover
+            $(document).on("click", ".popover", Kanboard.Popover);
+
             // Datepicker
             $(".form-date").datepicker({
                 showOtherMonths: true,
diff --git a/assets/js/src/board.js b/assets/js/src/board.js
index ecf94b9c..74965b40 100644
--- a/assets/js/src/board.js
+++ b/assets/js/src/board.js
@@ -4,6 +4,9 @@ Kanboard.Board = (function() {
 
     function on_popover(e)
     {
+        e.preventDefault();
+        e.stopPropagation();
+
         Kanboard.Popover(e, Kanboard.InitAfterAjax);
     }
 
@@ -109,18 +112,13 @@ Kanboard.Board = (function() {
             }
         });
 
-        // Assignee change
-        $(".assignee-popover").click(on_popover);
-
-        // Category change
-        $(".category-popover").click(on_popover);
-
-        // Task edit popover
-        $(".task-edit-popover").click(on_popover);
-        $(".task-creation-popover").click(on_popover);
+        // Task popover
+        $("#board").on("click", ".task-board-popover", on_popover);
 
-        // Description popover
-        $(".task-description-popover").click(on_popover);
+        // Redirect to the task details page
+        $("#board").on("click", ".task-board", function() {
+            window.location = $(this).data("task-url");
+        });
 
         // Tooltips for tasks
         $(".task-board-tooltip").tooltip({
@@ -205,13 +203,6 @@ Kanboard.Board = (function() {
             }, 100);
         });
 
-        // Redirect to the task details page
-        $("[data-task-url]").each(function() {
-            $(this).click(function() {
-                window.location = $(this).attr("data-task-url");
-            });
-        });
-
         // Automatic refresh
         var interval = parseInt($("#board").attr("data-check-interval"));
 
@@ -223,7 +214,6 @@ Kanboard.Board = (function() {
     // Stop events
     function board_unload_events()
     {
-        $("[data-task-url]").off();
         clearInterval(checkInterval);
     }