This repository has been archived by the owner on Jan 17, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 128
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Start #220, allow JPEG uploads, and respect content-type for JPEG or PNG * Fix #220, use JPEG for large shots - Allows JPEGs on the server, both to pass content checks, and to make use of stored content-types (instead of assuming image/png). - Puts an clip.image.type into shot objects - Uses .jpg for filenames when appropriate - Adds a new buildSetting for controlling the cutoff when we use JPEG - If a PNG image is too large, tries to make a JPEG and substitutes if the JPEG is actually smaller - Refactor some data:-URL and blob converstion functions into their own module
- Loading branch information
1 parent
197b691
commit 82139ed
Showing
13 changed files
with
161 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| this.blobConverters = (function () { | ||
| let exports = {}; | ||
|
|
||
| exports.dataUrlToBlob = function(url) { | ||
| const binary = atob(url.split(',')[1]); | ||
| let contentType = exports.getTypeFromDataUrl(url); | ||
| if (contentType != "image/png" && contentType != "image/jpeg") { | ||
| contentType = "image/png"; | ||
| } | ||
| const data = Uint8Array.from(binary, char => char.charCodeAt(0)); | ||
| const blob = new Blob([data], {type: contentType}); | ||
| return blob; | ||
| }; | ||
|
|
||
| exports.getTypeFromDataUrl = function(url) { | ||
| let contentType = url.split(',')[0]; | ||
| contentType = contentType.split(';')[0]; | ||
| contentType = contentType.split(':')[1]; | ||
| return contentType; | ||
| }; | ||
|
|
||
| exports.blobToArray = function(blob) { | ||
| return new Promise((resolve, reject) => { | ||
| let reader = new FileReader(); | ||
| reader.addEventListener("loadend", function() { | ||
| resolve(reader.result); | ||
| }); | ||
| reader.readAsArrayBuffer(blob); | ||
| }); | ||
| }; | ||
|
|
||
| exports.blobToDataUrl = function(blob) { | ||
| return new Promise((resolve, reject) => { | ||
| let reader = new FileReader(); | ||
| reader.addEventListener("loadend", function() { | ||
| resolve(reader.result); | ||
| }); | ||
| reader.readAsDataURL(blob); | ||
| }); | ||
| }; | ||
|
|
||
| return exports; | ||
| })(); | ||
| null; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.