diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-07-12 19:08:21 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-07-12 19:08:21 -0700 |
commit | ce440b5a43c800fa363bd23b64ba8b34020ec1c1 (patch) | |
tree | 46fd9b9584a57a187fc175b3d9cc952be43445fa | |
parent | 65e8abdfabce0c3e6f5f4bef1479bd67bb3d28ad (diff) | |
parent | b7afcc0947d149f145c32c203cf9b3d5712b9822 (diff) |
Merge pull request #1373 from int3/safari-blobs
Fix image loading in Safari.
-rw-r--r-- | src/library_browser.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/library_browser.js b/src/library_browser.js index 822e99d6..7f79b2bd 100644 --- a/src/library_browser.js +++ b/src/library_browser.js @@ -91,6 +91,10 @@ mergeInto(LibraryManager.library, { if (Browser.hasBlobConstructor) { try { b = new Blob([byteArray], { type: getMimetype(name) }); + if (b.size !== byteArray.length) { // Safari bug #118630 + // Safari's Blob can only take an ArrayBuffer + b = new Blob([(new Uint8Array(byteArray)).buffer], { type: getMimetype(name) }); + } } catch(e) { Runtime.warnOnce('Blob constructor present but fails: ' + e + '; falling back to blob builder'); } |