OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Save `content.info` as a local for readability

pull/21833/head
J. Ryan Stinnett 2019-05-13 18:00:52 +01:00 committed by David Baker
parent 851d207611
commit 3ea187a524
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/views/messages/MImageBody.js
View File

@ -198,9 +198,11 @@ export default class MImageBody extends React.Component {
// so we'll need to download the original image for this to work // so we'll need to download the original image for this to work
// well for now. First, let's try a few cases that let us avoid // well for now. First, let's try a few cases that let us avoid
// downloading the original: // downloading the original:
if (pixelRatio === 1.0 || const info = content.info;
(!content.info || !content.info.w || if (
!content.info.h || !content.info.size)) { pixelRatio === 1.0 ||
(!info || !info.w || !info.h || !info.size)
) {
// always thumbnail. it may look a bit worse, but it'll save bandwidth. // always thumbnail. it may look a bit worse, but it'll save bandwidth.
// which is probably desirable on a lo-dpi device anyway. // which is probably desirable on a lo-dpi device anyway.
return this.context.matrixClient.mxcUrlToHttp(content.url, thumbWidth, thumbHeight); return this.context.matrixClient.mxcUrlToHttp(content.url, thumbWidth, thumbHeight);
@ -215,10 +217,10 @@ export default class MImageBody extends React.Component {
// timeline (e.g. >1MB). // timeline (e.g. >1MB).
const isLargerThanThumbnail = ( const isLargerThanThumbnail = (
content.info.w > thumbWidth || info.w > thumbWidth ||
content.info.h > thumbHeight info.h > thumbHeight
); );
const isLargeFileSize = content.info.size > 1*1024*1024; const isLargeFileSize = info.size > 1*1024*1024;
if (isLargeFileSize && isLargerThanThumbnail) { if (isLargeFileSize && isLargerThanThumbnail) {
// image is too large physically and bytewise to clutter our timeline so // image is too large physically and bytewise to clutter our timeline so