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

v1.18.x
Julian Lam 4 years ago
parent 340387c18a
commit 41379e27c8

@ -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);
} }

Loading…
Cancel
Save