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

Revert "submitFormAjax is different enough from postToast to be annoying"

Browse source 
This reverts commit 0565e8d6a9.
This commit is contained in:
justcool393 2023-07-23 10:35:34 -05:00
parent 0565e8d6a9
commit 90186bd99f
2 changed files with 73 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -81,8 +81,31 @@ function expandDesktopImage(image) {
document.getElementById("desktop-expanded-image-wrap-link").href = image;
};
function postToast(targetElement, url, method, data, callbackFn) {
if (targetElement) { // disable element to avoid repeated requests
t.disabled = true;
t.classList.add("disabled");
}
const xhr = new XMLHttpRequest(); // set up the request now
xhr.open(method, url);
xhr.setRequestHeader("xhr", "xhr");
var form = new FormData();
form.append("formkey", formkey());
if (typeof data === 'object' && data !== null) {
for (let k of Object.keys(data)) {
form.append(k, data[k]);
}
}
xhr.onload = function() {
let data;
try {
data = JSON.parse(xhr.response);
} catch (e) {
console.error("Failed to parse response as JSON", e);
}
function showToastFromXhr(xhr, callbackFn) { // If callbackFn is specified, we'll try to use that first
var message = null;
if (callbackFn !== null) {
@ -96,14 +119,6 @@ function showToastFromXhr(xhr, callbackFn) { // If callbackFn is specified, we'l
}
}
let data;
try {
data = JSON.parse(xhr.response);
} catch (e) {
console.error("Failed to parse response as JSON", e);
if (message === null) return;
}
if (xhr.status >= 200 && xhr.status < 300 && data && data['message']) {
const toastPostSuccessTextElement = document.getElementById("toast-post-success-text");
if (message !== null) {
@ -131,27 +146,6 @@ function showToastFromXhr(xhr, callbackFn) { // If callbackFn is specified, we'l
}
}
function postToast(targetElement, url, method, data, callbackFn) {
if (targetElement) { // disable element to avoid repeated requests
t.disabled = true;
t.classList.add("disabled");
}
const xhr = new XMLHttpRequest(); // set up the request now
xhr.open(method, url);
xhr.setRequestHeader("xhr", "xhr");
var form = new FormData();
form.append("formkey", formkey());
if (typeof data === 'object' && data !== null) {
for (let k of Object.keys(data)) {
form.append(k, data[k]);
}
}
xhr.onload = function() {
showToastFromXhr(xhr, callbackFn);
}
setTimeout(() => {
t.disabled = false;
t.classList.remove("disabled");

32
files/assets/js/userpage_v.js
View file

@ -75,7 +75,6 @@ function transferBux(mobile=false) {
}
function submitFormAjax(e) {
e.preventDefault();
document.getElementById('message').classList.add('d-none');
document.getElementById('message-mobile').classList.add('d-none');
document.getElementById('message-preview').classList.add('d-none');
@ -83,7 +82,7 @@ function submitFormAjax(e) {
const form = e.target;
const xhr = new XMLHttpRequest();
// TODO: partially combine with postToast?
e.preventDefault();
formData = new FormData(form);
@ -99,9 +98,34 @@ function submitFormAjax(e) {
xhr.setRequestHeader('xhr', 'xhr');
xhr.onload = function() {
showToastFromXhr(xhr, null);
if (xhr.status >= 200 && xhr.status < 300) {
let data = JSON.parse(xhr.response);
try {
document.getElementById('toast-post-success-text').innerText = data["message"];
} catch(e) {
document.getElementById('toast-post-success-text').innerText = "Action successful!";
}
var myToast = bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success'));
myToast.show();
return true
} else {
document.getElementById('toast-post-error-text').innerText = "Error, please try again later."
try {
let data=JSON.parse(xhr.response);
var myToast = bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error'));
myToast.show();
if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"];
if (data && data["details"]) document.getElementById('toast-post-error-text').innerText = data["details"];
} catch(e) {
var myToast = bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success'));
myToast.hide();
var myToast = bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error'));
myToast.show();
}
}
};
xhr.send(formData);
return false;
return false
}