From 149095d91ece77eb41e1b9635be1076ce5f285a9 Mon Sep 17 00:00:00 2001 From: Aevann Date: Sat, 12 Aug 2023 13:35:59 +0300 Subject: [PATCH] remove jc bloat --- files/assets/js/admin/alts.js | 2 +- files/assets/js/comments_v.js | 4 ++-- files/assets/js/core.js | 20 +++++++++----------- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/files/assets/js/admin/alts.js b/files/assets/js/admin/alts.js index d3c403306..a7a3fe5ef 100644 --- a/files/assets/js/admin/alts.js +++ b/files/assets/js/admin/alts.js @@ -3,7 +3,7 @@ function submitAddAlt(element, username) { element.classList.add('disabled'); const form = new FormData(); form.append('other_username', document.getElementById('link-input-other').value); - const xhr = createXhrWithFormKey(`/@${username}/alts/`, 'POST', form); + const xhr = createXhrWithFormKey(`/@${username}/alts/`, form); xhr[0].onload = function() { let data; try { diff --git a/files/assets/js/comments_v.js b/files/assets/js/comments_v.js index a86f5b31c..cd1812b12 100644 --- a/files/assets/js/comments_v.js +++ b/files/assets/js/comments_v.js @@ -139,7 +139,7 @@ function post_reply(id) { } catch(e) {} - const xhr = createXhrWithFormKey("/reply", "POST", form); + const xhr = createXhrWithFormKey("/reply", form); const upload_prog = document.getElementById(`upload-prog-c_${id}`); xhr[0].upload.onprogress = (e) => {handleUploadProgress(e, upload_prog)}; @@ -197,7 +197,7 @@ function comment_edit(id){ form.append('file', e); } catch(e) {} - const xhr = createXhrWithFormKey("/edit_comment/"+id, "POST", form); + const xhr = createXhrWithFormKey("/edit_comment/"+id, form); const upload_prog = document.getElementById(`upload-prog-edit-c_${id}`); xhr[0].upload.onprogress = (e) => {handleUploadProgress(e, upload_prog)}; diff --git a/files/assets/js/core.js b/files/assets/js/core.js index a7c31a5f1..3d4b817c7 100644 --- a/files/assets/js/core.js +++ b/files/assets/js/core.js @@ -23,23 +23,23 @@ function showToast(success, message) { bootstrap.Toast.getOrCreateInstance(document.getElementById(element)).show(); } -function createXhrWithFormKey(url, method="POST", form=new FormData()) { +function createXhrWithFormKey(url, form=new FormData()) { const xhr = new XMLHttpRequest(); - xhr.open(method, url); + xhr.open('POST', url); xhr.setRequestHeader('xhr', 'xhr'); if (!form) form = new FormData(); form.append("formkey", formkey()); return [xhr, form]; // hacky but less stupid than what we were doing before } -function postToast(t, url, data, extraActionsOnSuccess, method="POST") { +function postToast(t, url, data, extraActionsOnSuccess) { let form = new FormData(); if (typeof data === 'object' && data !== null) { for(let k of Object.keys(data)) { form.append(k, data[k]); } } - const xhr = createXhrWithFormKey(url, method, form); + const xhr = createXhrWithFormKey(url, form); xhr[0].onload = function() { const success = xhr[0].status >= 200 && xhr[0].status < 300; @@ -62,11 +62,11 @@ function postToast(t, url, data, extraActionsOnSuccess, method="POST") { xhr[0].send(xhr[1]); } -function postToastReload(t, url, method="POST") { - postToast(t, url, {}, reload, method); +function postToastReload(t, url) { + postToast(t, url, {}, reload); } -function postToastSwitch(t, url, button1, button2, cls, extraActionsOnSuccess, method="POST") { +function postToastSwitch(t, url, button1, button2, cls, extraActionsOnSuccess) { postToast(t, url, { }, @@ -87,9 +87,8 @@ function postToastSwitch(t, url, button1, button2, cls, extraActionsOnSuccess, m } } if (typeof extraActionsOnSuccess == 'function') - extraActionsOnSuccess(xhr); - } - , method); + extraActionsOnSuccess(xhr); + }); } if (!location.pathname.endsWith('/submit')) @@ -643,7 +642,6 @@ function updateSubscriptionOnServer(subscription, apiEndpoint) { const xhr = createXhrWithFormKey( apiEndpoint, - 'POST', formData );