Skip to content

Commit 5087975

Browse files
committed
Merge branch 'release/v0.25.6'
2 parents 290d9fa + 14b192b commit 5087975

File tree

3 files changed

+22
-18
lines changed

3 files changed

+22
-18
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "zeed",
33
"type": "module",
4-
"version": "0.25.5",
4+
"version": "0.25.6",
55
"description": "🌱 Simple foundation library",
66
"author": {
77
"name": "Dirk Holtwick",

src/common/bin/index.ts

+19-16
Original file line numberDiff line numberDiff line change
@@ -95,22 +95,25 @@ export function bitfield(bitfield = 0) {
9595
// Cast
9696

9797
export async function blobToArrayBuffer(blob: Blob | File): Promise<ArrayBuffer | undefined> {
98-
return await blob.arrayBuffer()
99-
// try {
100-
// return new Promise((resolve, reject) => {
101-
// try {
102-
// const reader = new FileReader()
103-
// reader.onloadend = () => resolve(reader.result as ArrayBuffer)
104-
// reader.onerror = err => reject(err)
105-
// reader.onabort = err => reject(err)
106-
// reader.readAsArrayBuffer(blob)
107-
// }
108-
// catch (err) {
109-
// reject(err)
110-
// }
111-
// })
112-
// }
113-
// catch (err) {}
98+
if (blob.arrayBuffer)
99+
return await blob.arrayBuffer()
100+
101+
// Fallback for older browsers
102+
try {
103+
return new Promise((resolve, reject) => {
104+
try {
105+
const reader = new FileReader()
106+
reader.onloadend = () => resolve(reader.result as ArrayBuffer)
107+
reader.onerror = err => reject(err)
108+
reader.onabort = err => reject(err)
109+
reader.readAsArrayBuffer(blob)
110+
}
111+
catch (err) {
112+
reject(err)
113+
}
114+
})
115+
}
116+
catch (err) {}
114117
}
115118

116119
export async function blobToUint8Array(blob: Blob | File): Promise<Uint8Array | undefined> {

src/common/data/datauri.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { blobToArrayBuffer } from '../bin'
12
import { fromBase64, toBase64 } from './bin'
23

34
export function dataUriToUint8Array(dataUri: string): Uint8Array | undefined {
@@ -18,7 +19,7 @@ export function dataUriToBlob(dataUri: string): Blob | undefined {
1819
}
1920

2021
export async function blobToDataUri(blob: Blob): Promise<string | undefined> {
21-
const bin = await blob.arrayBuffer()
22+
const bin = await blobToArrayBuffer(blob)
2223
if (bin)
2324
return `data:${blob.type},${toBase64(bin)}`
2425
}

0 commit comments

Comments
 (0)