diff --git a/dev/server.js b/dev/server.js index 3309e308..7ec1e065 100644 --- a/dev/server.js +++ b/dev/server.js @@ -86,12 +86,12 @@ class ServerExample { this.getForm(request) .then(({files}) => { - let image = files[this.fieldName] || {}; + let image = files[this.fieldName][0] || {}; responseJson.success = 1; responseJson.file = { - url: image.path, - name: image.name, + url: 'file://' + image.filepath, + name: image.newFilename, size: image.size }; }) @@ -147,10 +147,12 @@ class ServerExample { */ getForm(request) { return new Promise((resolve, reject) => { - const form = new formidable.IncomingForm(); + const form = new formidable.IncomingForm({ + uploadDir: this.uploadDir, + keepExtensions: true + }); - form.uploadDir = this.uploadDir; - form.keepExtensions = true; + console.error('the form info:', form); form.parse(request, (err, fields, files) => { if (err) { diff --git a/package.json b/package.json index 4666afa9..147e0954 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@editorjs/image", - "version": "2.9.1", + "version": "2.9.2", "keywords": [ "codex editor", "image", diff --git a/src/types/codexteam__ajax.d.ts b/src/types/codexteam__ajax.d.ts index 63c45a52..f7101558 100644 --- a/src/types/codexteam__ajax.d.ts +++ b/src/types/codexteam__ajax.d.ts @@ -3,7 +3,7 @@ declare module '@codexteam/ajax' { url?: string; data?: any; accept?: string; - headers?: Headers; + headers?: object; beforeSend?: (files: File[]) => void; fieldName?: string; type?: string; diff --git a/src/uploader.ts b/src/uploader.ts index 3f456ba9..32d7b39f 100644 --- a/src/uploader.ts +++ b/src/uploader.ts @@ -89,12 +89,12 @@ export default class Uploader { upload = ajax.transport({ url: this.config.endpoints.byFile, data: this.config.additionalRequestData, - accept: this.config.types, - headers: new Headers(this.config.additionalRequestHeaders as Record), + accept: this.config.types || 'image/*', + headers: this.config.additionalRequestHeaders as Record, beforeSend: (files: File[]) => { preparePreview(files[0]); }, - fieldName: this.config.field, + fieldName: this.config.field || 'image', }).then((response: any) => response.body); } @@ -133,7 +133,7 @@ export default class Uploader { url: url, }, this.config.additionalRequestData), type: ajax.contentType.JSON, - headers: new Headers(this.config.additionalRequestHeaders as Record), + headers: this.config.additionalRequestHeaders as Record, }).then((response: any) => response.body); } @@ -193,7 +193,7 @@ export default class Uploader { url: this.config.endpoints.byFile, data: formData, type: ajax.contentType.JSON, - headers: new Headers(this.config.additionalRequestHeaders as Record), + headers: this.config.additionalRequestHeaders as Record, }).then((response: any) => response.body); }