Merge remote-tracking branch 'upstream/pull/5814'

[rails.git] / app / assets / javascripts / heatmap.js

diff --git a/app/assets/javascripts/heatmap.js b/app/assets/javascripts/heatmap.js
index 0670480d33dfe448e1ca3e9183b3be9d313b2899..09013ae5a10303d7a0136ce13c04f7ffd5b8f713 100644 (file)
--- a/app/assets/javascripts/heatmap.js
+++ b/app/assets/javascripts/heatmap.js
@@ -70,17 +70,19 @@ document.addEventListener("DOMContentLoaded", () => {
       }]
     ]);
 
       }]
     ]);
 

-    cal.on("mouseover", (event, _timestamp, value) => {
-      if (value) event.target.style.cursor = "pointer";
-    });
+    cal.on("mouseover", (event, timestamp, value) => {
+      if (!displayName || !value) return;
+      if (event.target.parentElement.nodeName === "a") return;

 
 

-    cal.on("click", (_event, timestamp) => {
-      if (!displayName) return;

       for (const { date, max_id } of heatmapData) {
         if (!max_id) continue;
         if (timestamp !== Date.parse(date)) continue;
       for (const { date, max_id } of heatmapData) {
         if (!max_id) continue;
         if (timestamp !== Date.parse(date)) continue;

+

         const params = new URLSearchParams([["before", max_id + 1]]);
         const params = new URLSearchParams([["before", max_id + 1]]);

-        location = `/user/${encodeURIComponent(displayName)}/history?${params}`;
+        const a = document.createElementNS("http://www.w3.org/2000/svg", "a");
+        a.setAttribute("href", `/user/${encodeURIComponent(displayName)}/history?${params}`);
+        $(event.target).wrap(a);
+        break;

       }
     });
   }
       }
     });
   }