From 5f16356d7afddf2a0eaca093ab1d11b5e0f13059 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Thu, 20 Oct 2022 15:45:56 -0500 Subject: [PATCH] use showToast in some areas where we weren't before --- files/assets/js/comments.js | 3 +-- files/assets/js/settings_blocks.js | 11 +---------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/files/assets/js/comments.js b/files/assets/js/comments.js index f903b94c6..8472ab60c 100644 --- a/files/assets/js/comments.js +++ b/files/assets/js/comments.js @@ -1,6 +1,5 @@ function poll_vote_no_v() { - document.getElementById('toast-post-error-text').innerText = "Only logged-in users can vote!"; - bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); + showToast(false, "Only logged-in users can vote!"); } function expandMarkdown(id,type) { diff --git a/files/assets/js/settings_blocks.js b/files/assets/js/settings_blocks.js index af1269b38..2b928e5f3 100644 --- a/files/assets/js/settings_blocks.js +++ b/files/assets/js/settings_blocks.js @@ -1,13 +1,8 @@ function block_user() { - var usernameField = document.getElementById("exile-username"); - var isValidUsername = usernameField.checkValidity(); - username = usernameField.value; - if (isValidUsername) { - const xhr = new XMLHttpRequest(); xhr.open("post", "/settings/block"); xhr.setRequestHeader('xhr', 'xhr'); @@ -19,11 +14,7 @@ function block_user() { location.reload(); } else { - var myToast = bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')); - myToast.hide(); - var myToast = bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')); - myToast.show(); - document.getElementById("toast-error-message").textContent = "Error. Please try again later."; + showToast(false, "Error, please try again later."); } } xhr.send(f)