Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-30 03:09:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: hack uploader to handle a response from v3 write api

Browse Source
This commit is contained in:
Julian Lam
2020-12-04 14:52:03 -05:00
parent 340387c18a
commit 41379e27c8
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
public/src/modules/uploader.js
View File

@@ -65,7 +65,9 @@ define('uploader', ['jquery-form'], function () {
} }
module.ajaxSubmit = function (uploadModal, callback) { module.ajaxSubmit = function (uploadModal, callback) {
uploadModal.find('#uploadForm').ajaxSubmit({ const uploadForm = uploadModal.find('#uploadForm');
const v3 = uploadForm.attr('action').startsWith(config.relative_path + '/api/v3/');
uploadForm.ajaxSubmit({
headers: { headers: {
'x-csrf-token': config.csrf_token, 'x-csrf-token': config.csrf_token,
}, },
@@ -79,6 +81,17 @@ define('uploader', ['jquery-form'], function () {
success: function (response) { success: function (response) {
response = maybeParse(response); response = maybeParse(response);
// Appropriately handle v3 API responses
if (v3) {
if (response.status.code === 'ok') {
response = response.response.images;
} else {
response = {
error: response.status.code,
};
}
}
if (response.error) { if (response.error) {
return showAlert(uploadModal, 'error', response.error); return showAlert(uploadModal, 'error', response.error);
} }