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

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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/'); return this.model.contentType.startsWith('video/');
}, },
isImage: function() { isImage: function() {
return this.model.contentType.startsWith('image/'); var type = this.model.contentType;
return type.startsWith('image/') && type !== 'image/tiff';
}, },
mediaType: function() { mediaType: function() {
if (this.isVoiceMessage()) { if (this.isVoiceMessage()) {

7
js/views/file_input_view.js
View file

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