From 6c12feac628b6f694ff47a26e3983649f99a7ecf Mon Sep 17 00:00:00 2001 From: ljf Date: Sun, 12 Sep 2021 23:53:59 +0200 Subject: [PATCH] [fix] Repair app install --- app/src/helpers/yunohostArguments.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/app/src/helpers/yunohostArguments.js b/app/src/helpers/yunohostArguments.js index 336656e6..bb2e23b2 100644 --- a/app/src/helpers/yunohostArguments.js +++ b/app/src/helpers/yunohostArguments.js @@ -289,16 +289,23 @@ export function formatYunoHostArguments (args, name = null) { return { form, fields, validations, errors } } -export function pFileReader (file, output, key) { +export function pFileReader (file, output, key, base64 = true) { return new Promise((resolve, reject) => { const fr = new FileReader() fr.onerror = reject fr.onload = () => { - output[key] = fr.result.replace(/data:[^;]*;base64,/, '') + output[key] = fr.result + if (base64) { + output[key] = fr.result.replace(/data:[^;]*;base64,/, '') + } output[key + '[name]'] = file.name resolve() } - fr.readAsDataURL(file) + if (base64) { + fr.readAsDataURL(file) + } else { + fr.readAsText(file) + } }) } /** @@ -328,7 +335,7 @@ export function formatFormDataValue (value) { * @param {Boolean} [extraParams.removeEmpty=true] - Removes "empty" values from the object. * @return {Object} the parsed data to be sent to the server, with extracted values if specified. */ -export async function formatFormData ( +export function formatFormData ( formData, { extract = null, flatten = false, removeEmpty = true, removeNull = false, promise = false } = {} ) {