Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 12:19:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Treat tiffs like unrecognized files; Chrome doesn't render them (#1901)

Browse Source
This commit is contained in:
Scott Nonnenberg
2017-12-14 17:32:58 -08:00
committed by GitHub
parent 5caee59921
commit 7781f8fa5b
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
js/views/attachment_view.js
View File

@@ -130,7 +130,8 @@
return this.model.contentType.startsWith('video/');
},
isImage: function() {
return this.model.contentType.startsWith('image/');
var type = this.model.contentType;
return type.startsWith('image/') && type !== 'image/tiff';
},
mediaType: function() {
if (this.isVoiceMessage()) {

7
js/views/file_input_view.js
View File

@@ -70,7 +70,9 @@
},
autoScale: function(file) {
if (file.type.split('/')[0] !== 'image' || file.type === 'image/gif') {
if (file.type.split('/')[0] !== 'image'
|| file.type === 'image/gif'
|| file.type === 'image/tiff') {
// nothing to do
return Promise.resolve(file);
}
@@ -123,6 +125,9 @@
if (!file) { return; }
var type = file.type.split('/')[0];
if (file.type === 'image/tiff') {
type = 'file';
}
switch (type) {
case 'audio': this.addThumb('images/audio.svg'); break;
case 'video': this.addThumb('images/video.svg'); break;