diff --git a/js/models/conversations.js b/js/models/conversations.js index 6876a50536..15fb7fa8b2 100644 --- a/js/models/conversations.js +++ b/js/models/conversations.js @@ -631,7 +631,7 @@ const objectUrl = this.makeObjectUrl(data, contentType); const thumbnail = Signal.Util.GoogleChrome.isImageTypeSupported(contentType) - ? await Whisper.FileInputView.makeThumbnail(128, objectUrl) + ? await Whisper.FileInputView.makeImageThumbnail(128, objectUrl) : await Whisper.FileInputView.makeVideoThumbnail(128, objectUrl); URL.revokeObjectURL(objectUrl); @@ -1163,8 +1163,6 @@ return true; } - // Maybe in the future we could try to pull the thumbnail from a video ourselves, - // but for now we will rely on incoming thumbnails only. if (!Signal.Util.GoogleChrome.isImageTypeSupported(first.contentType) && !Signal.Util.GoogleChrome.isVideoTypeSupported(first.contentType)) { return false; diff --git a/js/views/file_input_view.js b/js/views/file_input_view.js index 21896fa477..151f99b347 100644 --- a/js/views/file_input_view.js +++ b/js/views/file_input_view.js @@ -28,7 +28,7 @@ template: i18n('unsupportedFileType'), }); - function makeThumbnail(size, objectUrl) { + function makeImageThumbnail(size, objectUrl) { return new Promise(((resolve, reject) => { const img = document.createElement('img'); img.onerror = reject; @@ -117,7 +117,7 @@ const arrayBuffer = await blobToArrayBuffer(blob); const screenshotObjectUrl = makeObjectUrl(arrayBuffer, 'image/png'); - return makeThumbnail(size, screenshotObjectUrl); + return makeImageThumbnail(size, screenshotObjectUrl); } Whisper.FileInputView = Backbone.View.extend({ @@ -354,7 +354,7 @@ const objectUrl = URL.createObjectURL(file); - const arrayBuffer = await makeThumbnail(size, objectUrl); + const arrayBuffer = await makeImageThumbnail(size, objectUrl); URL.revokeObjectURL(objectUrl); return this.readFile(arrayBuffer); @@ -447,7 +447,7 @@ }, }); - Whisper.FileInputView.makeThumbnail = makeThumbnail; + Whisper.FileInputView.makeImageThumbnail = makeImageThumbnail; Whisper.FileInputView.makeVideoThumbnail = makeVideoThumbnail; Whisper.FileInputView.makeVideoScreenshot = makeVideoScreenshot; }()); diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss index b1738dd013..c17ac76f87 100644 --- a/stylesheets/_conversation.scss +++ b/stylesheets/_conversation.scss @@ -940,7 +940,6 @@ span.status { bottom: 0; left: 0; - display: flex; text-align: center; display: flex; align-items: center;