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

Move to central MIME functions, remove some console.log

Browse source 
And generally address PR feedback.
This commit is contained in:
Scott Nonnenberg 2018-04-12 19:02:20 -07:00
parent f255cbcbe3
commit fce9bb7342
No known key found for this signature in database
GPG key ID: 5F82280C35134661
6 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/views/message_view.js
View file

@ -10,7 +10,7 @@
(function () {
'use strict';
const { HTML } = window.Signal;
const { Signal } = window;
const { loadAttachmentData } = window.Signal.Migrations;
window.Whisper = window.Whisper || {};
@ -401,7 +401,7 @@
return Object.assign({}, attachment, {
// eslint-disable-next-line no-bitwise
isVoiceMessage: attachment.flags & VOICE_FLAG,
isVoiceMessage: Boolean(attachment.flags & VOICE_FLAG),
thumbnail,
});
}
@ -456,7 +456,7 @@
}
const first = attachments[0];
if (first.contentType.startsWith('image/') && first.contentType !== 'image/tiff') {
if (Signal.Types.MIME.isImage(first.contentType)) {
return true;
}
@ -483,7 +483,7 @@
if (body.length > 0) {
const escapedBody = body.html();
body.html(HTML.render(escapedBody));
body.html(Signal.HTML.render(escapedBody));
}
this.renderSent();