mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Move to some of our global utility methods

Browse source
This commit is contained in:
Scott Nonnenberg 2018-04-26 12:01:31 -07:00
parent 403fb1fd60
commit 84c7a4c293
2 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

24
js/views/file_input_view.js
View file

@ -84,7 +84,7 @@
video.addEventListener('error', (error) => {
console.log(
'makeVideoThumbnail error',
error && error.stack ? error.stack : error
Signal.Types.Errors.toLogFormat(error)
);
reject(error);
});
@ -93,13 +93,6 @@
}));
}
function makeObjectUrl(data, contentType) {
const blob = new Blob([data], {
type: contentType,
});
return URL.createObjectURL(blob);
}
function blobToArrayBuffer(blob) {
return new Promise((resolve, reject) => {
const fileReader = new FileReader();
@ -114,8 +107,11 @@
async function makeVideoThumbnail(size, videoObjectUrl) {
const blob = await makeVideoScreenshot(videoObjectUrl);
const arrayBuffer = await blobToArrayBuffer(blob);
const screenshotObjectUrl = makeObjectUrl(arrayBuffer, 'image/png');
const data = await blobToArrayBuffer(blob);
const screenshotObjectUrl = Signal.Util.arrayBufferToObjectURL({
data,
type: 'image/png',
});
const thumbnail = await makeImageThumbnail(size, screenshotObjectUrl);
URL.revokeObjectURL(screenshotObjectUrl);
@ -244,9 +240,11 @@
const thumbnail = await makeVideoScreenshot(this.previewObjectUrl);
URL.revokeObjectURL(this.previewObjectUrl);
const arrayBuffer = await blobToArrayBuffer(thumbnail);
this.previewObjectUrl = makeObjectUrl(arrayBuffer, 'image/png');
const data = await blobToArrayBuffer(thumbnail);
this.previewObjectUrl = Signal.Util.arrayBufferToObjectURL({
data,
type: 'image/png',
});
this.addThumb(this.previewObjectUrl, { addPlayIcon: true });
};