rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

use showToast in most places that we can

remotes/1693176582716663532/tmp_refs/heads/watchparty
justcool393 2022-10-14 03:15:06 -07:00
parent 5e55ff7f90
commit c12f5ae43a
6 changed files with 18 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
files/assets/js/ban_modal.js
View File

@ -15,15 +15,8 @@ function banModal(link, id, name) {
let data let data
try {data = JSON.parse(xhr.response)} try {data = JSON.parse(xhr.response)}
catch(e) {console.log(e)} catch(e) {console.log(e)}
if (xhr.status >= 200 && xhr.status < 300 && data && data['message']) { success = xhr.status >= 200 && xhr.status < 300;
document.getElementById('toast-post-success-text').innerText = data["message"]; showToast(success, getMessageFromJsonData(success, data));
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')).show();
} else {
document.getElementById('toast-post-error-text').innerText = "Error, please try again later."
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"];
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show();
}
}; };
xhr.send(form); xhr.send(form);

11
files/assets/js/comments_admin.js
View File

@ -85,15 +85,8 @@ function adminMuteUser(userId, muteStatus, buttonId) {
let data let data
try {data = JSON.parse(xhr.response)} try {data = JSON.parse(xhr.response)}
catch(e) {console.log(e)} catch(e) {console.log(e)}
if (xhr.status >= 200 && xhr.status < 300 && data && data['message']) { success = xhr.status >= 200 && xhr.status < 300;
document.getElementById('toast-post-success-text').innerText = data["message"]; showToast(success, getMessageFromJsonData(success, data));
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')).show();
} else {
document.getElementById('toast-post-error-text').innerText = "Error, please try again later."
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"];
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show();
}
}; };
xhr.send(form); xhr.send(form);

45
files/assets/js/comments_v.js
View File

@ -40,15 +40,8 @@ function report_commentModal(id, author) {
let data let data
try {data = JSON.parse(xhr.response)} try {data = JSON.parse(xhr.response)}
catch(e) {console.log(e)} catch(e) {console.log(e)}
if (xhr.status >= 200 && xhr.status < 300 && data && data['message']) { success = xhr.status >= 200 && xhr.status < 300;
document.getElementById('toast-post-success-text').innerText = data["message"]; showToast(success, getMessageFromJsonData(success, data));
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')).show();
} else {
document.getElementById('toast-post-error-text').innerText = "Error, please try again later."
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"];
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show();
}
}; };
xhr.onerror=function(){alert(errortext)}; xhr.onerror=function(){alert(errortext)};
@ -117,13 +110,9 @@ function delete_commentModal(id) {
document.getElementById(`undelete-${id}`).classList.remove('d-none'); document.getElementById(`undelete-${id}`).classList.remove('d-none');
document.getElementById(`delete2-${id}`).classList.add('d-none'); document.getElementById(`delete2-${id}`).classList.add('d-none');
document.getElementById(`undelete2-${id}`).classList.remove('d-none'); document.getElementById(`undelete2-${id}`).classList.remove('d-none');
document.getElementById('toast-post-success-text').innerText = data["message"]; showToast(true, getMessageFromJsonData(true, data));
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')).show();
} else { } else {
document.getElementById('toast-post-error-text').innerText = "Error, please try again later." showToast(false, getMessageFromJsonData(false, data));
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"];
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show();
} }
}; };
xhr.send(form); xhr.send(form);
@ -167,12 +156,8 @@ function post_reply(id){
document.getElementById('reply-form-body-'+id).value = '' document.getElementById('reply-form-body-'+id).value = ''
document.getElementById('message-reply-'+id).innerHTML = '' document.getElementById('message-reply-'+id).innerHTML = ''
ToggleReplyBox('reply-message-'+id) ToggleReplyBox('reply-message-'+id)
} } else {
else { showToast(false, getMessageFromJsonData(false, data));
if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"];
else document.getElementById('toast-post-error-text').innerText = "Error, please try again later."
if (data && data["details"]) document.getElementById('toast-post-error-text').innerText = data["details"];
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show();
} }
setTimeout(() => { setTimeout(() => {
btn.disabled = false; btn.disabled = false;
@ -213,10 +198,7 @@ function comment_edit(id){
document.getElementById('filename-edit-reply-' + id).innerHTML = '<i class="fas fa-file"></i>'; document.getElementById('filename-edit-reply-' + id).innerHTML = '<i class="fas fa-file"></i>';
} }
else { else {
if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"]; showToast(false, getMessageFromJsonData(false, data));
else document.getElementById('toast-post-error-text').innerText = "Error, please try again later."
if (data && data["details"]) document.getElementById('toast-post-error-text').innerText = data["details"];
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show();
} }
setTimeout(() => { setTimeout(() => {
btn.disabled = false; btn.disabled = false;
@ -273,10 +255,7 @@ function post_comment(fullname, hide){
document.getElementById('filename-show-reply-' + fullname).innerHTML = '<i class="fas fa-file"></i>'; document.getElementById('filename-show-reply-' + fullname).innerHTML = '<i class="fas fa-file"></i>';
} }
else { else {
if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"]; showToast(false, getMessageFromJsonData(false, data));
else document.getElementById('toast-post-error-text').innerText = "Error, please try again later."
if (data && data["details"]) document.getElementById('toast-post-error-text').innerText = data["details"];
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show();
setTimeout(() => { setTimeout(() => {
btn.disabled = false; btn.disabled = false;
btn.classList.remove('disabled'); btn.classList.remove('disabled');
@ -361,12 +340,8 @@ function handle_action(type, cid, thing) {
if (data && data["response"]) { if (data && data["response"]) {
const element = document.getElementById(`${type}-${cid}`); const element = document.getElementById(`${type}-${cid}`);
element.innerHTML = data["response"] element.innerHTML = data["response"]
} } else {
else { showToast(false, getMessageFromJsonData(false, data));
if (data && data["error"]) document.getElementById('toast-post-error-text').innerText = data["error"];
else document.getElementById('toast-post-error-text').innerText = "Error, please try again later."
if (data && data["details"]) document.getElementById('toast-post-error-text').innerText = data["details"];
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show();
} }
setTimeout(() => { setTimeout(() => {
for (const btn of btns) for (const btn of btns)

5
files/assets/js/delete_post_modal.js
View File

@ -18,10 +18,7 @@ function delete_postModal(id) {
document.getElementById('toast-post-success-text').innerText = data["message"]; document.getElementById('toast-post-success-text').innerText = data["message"];
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')).show(); bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')).show();
} else { } else {
document.getElementById('toast-post-error-text').innerText = "Error, please try again later." showToast(false, getMessageFromJsonData(false, data));
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"];
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show();
} }
}; };
xhr.send(form); xhr.send(form);

11
files/assets/js/report_post_modal.js
View File

@ -39,15 +39,8 @@ function report_postModal(id) {
let data let data
try {data = JSON.parse(xhr.response)} try {data = JSON.parse(xhr.response)}
catch(e) {console.log(e)} catch(e) {console.log(e)}
if (xhr.status >= 200 && xhr.status < 300 && data && data['message']) { success = xhr.status >= 200 && xhr.status < 300;
document.getElementById('toast-post-success-text').innerText = data["message"]; showToast(success, getMessageFromJsonData(success, data));
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-success')).show();
} else {
document.getElementById('toast-post-error-text').innerText = "Error, please try again later."
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"];
bootstrap.Toast.getOrCreateInstance(document.getElementById('toast-post-error')).show();
}
}; };
xhr.onerror=function(){alert(errortext)}; xhr.onerror=function(){alert(errortext)};

8
files/assets/js/userpage_v.js
View File

@ -105,13 +105,7 @@ function submitFormAjax(e) {
xhr.onload = function() { xhr.onload = function() {
if (xhr.status >= 200 && xhr.status < 300) { if (xhr.status >= 200 && xhr.status < 300) {
let data = JSON.parse(xhr.response); let data = JSON.parse(xhr.response);
try { showToast(true, getMessageFromJsonData(true, data));
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 return true
} else { } else {
document.getElementById('toast-post-error-text').innerText = "Error, please try again later." document.getElementById('toast-post-error-text').innerText = "Error, please try again later."