Use delete_dispatcher() as intended

I had earlier begun a pattern for dispatching "Delete" clicks to the correct
function for the room view, in the same way we dispatch "Enter Message" clicks.
This commit modifies the mailbox view to use that framework.

diff --git a/webcit-ng/static/js/view_mail.js b/webcit-ng/static/js/view_mail.js
index e79f7d964fca40829aab38c61afdfc3d200b0b34..3cfdb8ca39f04b649ef7b1a5efa6743bf555692d 100644 (file)
--- a/webcit-ng/static/js/view_mail.js
+++ b/webcit-ng/static/js/view_mail.js
@@ -265,7 +265,7 @@ function view_render_mail() {
        let d = document.getElementById("ctdl-delete-button");
        d.innerHTML = "<i class=\"fa fa-trash\"></i>" + _("Delete");
        d.style.display = "block";
-       d.addEventListener("click", mail_delete_selected);
+       //d.addEventListener("click", mail_delete_selected);
 
        document.getElementById("ctdl-main").innerHTML
                = "<div id=\"ctdl-mailbox-grid-container\" class=\"ctdl-mailbox-grid-container\">"

diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index 49323ee16896e1c2e9eb7280b9a7998ddb91ee37..2d65edb3bdde01e93332f6c9fe7a5a27cae4f357 100644 (file)
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -109,3 +109,16 @@ function entmsg_dispatcher() {
        }
 }
 
+
+// This gets called when the user clicks the "delete" button etc.
+function delete_dispatcher() {
+       switch(current_view) {
+               case views.VIEW_MAILBOX:
+                       mail_delete_selected();
+                       break;
+               default:
+                       break;
+       }
+}
+
+