From f95150f6a9569fabcb31f3acd9f6b7bf50b5d145 Mon Sep 17 00:00:00 2001 From: Daniel Gasienica Date: Tue, 13 Feb 2018 11:17:30 -0500 Subject: [PATCH] Revert "Replace custom functions with `blob-util`" This reverts commit 8a81e9c01bfe80c0e1bf76737092206c06949512. --- js/modules/types/attachment.js | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/js/modules/types/attachment.js b/js/modules/types/attachment.js index f32a21e308..34a374bfa1 100644 --- a/js/modules/types/attachment.js +++ b/js/modules/types/attachment.js @@ -2,7 +2,6 @@ const dataURLToBlob = require('blueimp-canvas-to-blob'); const MIME = require('./mime'); -const { arrayBufferToBlob, blobToArrayBuffer } = require('blob-util'); const { autoOrientImage } = require('../auto_orient_image'); // Increment this everytime we change how attachments are processed. This allows us to @@ -24,6 +23,26 @@ const CURRENT_PROCESS_VERSION = 1; // data: ArrayBuffer // } +// Data type conversion +const blobToArrayBuffer = blob => + new Promise((resolve, reject) => { + const fileReader = new FileReader(); + + fileReader.onload = event => + resolve(event.target.result); + + fileReader.onerror = (event) => { + const error = new Error('blobToArrayBuffer: Failed to convert blob'); + error.cause = event; + reject(error); + }; + + fileReader.readAsArrayBuffer(blob); + }); + +const arrayBufferToBlob = (arrayBuffer, mimeType) => + new Blob([arrayBuffer], { type: mimeType }); + // Middleware // type ProcessingStep = Attachment -> Promise Attachment