From 8aa23c7dc75ff8cd1d8f1a30e8c721cccc3192be Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Tue, 12 May 2020 17:32:46 +0000
Subject: [PATCH] SusiMail: Replace onclick part 2

---
 apps/susimail/src/js/folder.js                     | 14 ++++++++++++++
 .../susimail/src/src/i2p/susi/webmail/WebMail.java |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/susimail/src/js/folder.js b/apps/susimail/src/js/folder.js
index ee473da54..b7646fa1e 100644
--- a/apps/susimail/src/js/folder.js
+++ b/apps/susimail/src/js/folder.js
@@ -18,6 +18,13 @@ function initButtons() {
 		addClickHandler3(button);
 	}
 	// TODO delete button, to show really-delete section or popup
+
+	buttons = document.getElementsByClassName("tdclick");
+	for(index = 0; index < buttons.length; index++)
+	{
+		var button = buttons[index];
+		addClickHandler4(button);
+	}
 }
 
 function addClickHandler1(elem)
@@ -61,6 +68,13 @@ function addClickHandler3(elem)
 	});
 }
 
+function addClickHandler4(elem)
+{
+	elem.addEventListener("click", function() {
+		document.location = elem.getAttribute("onclickloc");
+	});
+}
+
 function deleteboxclicked() {
 	var hasOne = false;
 	var hasAll = true;
diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index ae4c52e21..05bbdbc57 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -3202,7 +3202,7 @@ public class WebMail extends HttpServlet
 			String b64UIDL = Base64.encode(uidl);
 			String loc = myself + '?' + (folderName.equals(DIR_DRAFTS) ? NEW_UIDL : SHOW) + '=' + b64UIDL + floc;
 			String link = "<a href=\"" + loc + "\" class=\"" + type + "\">";
-			String jslink = " onclick=\"document.location='" + loc + "';\" ";
+			String jslink = " class=\"tdclick\" onclickloc=\"" + loc + "\" ";
 
 			boolean idChecked = false;
 			String checkId = sessionObject.pageChanged ? null : request.getParameter( "check" + b64UIDL );