skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rejigger the messaging

Browse source
This commit is contained in:
justcool393 2023-07-23 09:35:33 -05:00
parent 95405d8fdb
commit 5d01c9b5f9
1 changed files with 23 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

38
files/assets/js/header.js
View file

@ -106,34 +106,42 @@ function postToast(targetElement, url, method, data, callbackFn) {
console.error("Failed to parse response as JSON", e); console.error("Failed to parse response as JSON", e);
} }
var message = null;
if (callbackFn !== null) { if (callbackFn !== null) {
try { try {
var result = callbackFn(xhr); const result = callbackFn(xhr);
if (typeof result === 'string' && result !== null) {
message = result;
}
} catch (e) { } catch (e) {
console.error("Failed to run callback function for postToast", e, xhr); console.error("Failed to run callback function for postToast", e, xhr);
var result = null;
} }
} else {
var result = null;
}
if (typeof result === 'string' && result !== null) {
var messageOverride = result;
} else {
var messageOverride = null;
} }
if (xhr.status >= 200 && xhr.status < 300 && data && data['message']) { if (xhr.status >= 200 && xhr.status < 300 && data && data['message']) {
const toastPostSuccessTextElement = document.getElementById("toast-post-success-text"); const toastPostSuccessTextElement = document.getElementById("toast-post-success-text");
toastPostSuccessTextElement.innerText = data["message"]; if (message !== null) {
if (messageOverride) toastPostSuccessTextElement.innerText = messageOverride; message = data["message"];
}
if (message === null) {
message = "Success!";
}
toastPostSuccessTextElement.innerText = message;
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')).show(); bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')).show();
callbackFn(xhr); callbackFn(xhr);
} else { } else {
const toastPostErrorTextElement = document.getElementById('toast-post-error-text'); const toastPostErrorTextElement = document.getElementById('toast-post-error-text');
toastPostErrorTextElement.innerText = "Error, please try again later." if (message != null && data) {
if (data && data["error"]) toastPostErrorTextElement.innerText = data["error"]; if (data["details"]) {
if (data && data["details"]) toastPostErrorTextElement.innerText = data["details"]; message = data["details"];
if (messageOverride) toastPostErrorTextElement.innerText = messageOverride; } else if (data["error"]) {
message = data["error"];
} else {
message = "Error, please try again later.";
}
}
if (messageOverride) toastPostErrorTextElement.innerText = message;
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show(); bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show();
} }
} }