From a77708bc342472b301e15895763097b59aaa84e7 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Thu, 16 Feb 2017 10:43:05 +0000 Subject: [PATCH 1/4] Request correct dimensions for image thumbnails This is for when dynamic thumbnails are enabled on the home server, which will scale to exactly the dimensions provided. --- src/components/views/messages/MImageBody.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index 10941e0f7f7..146a2a8d188 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -106,7 +106,8 @@ module.exports = React.createClass({ } return this.state.decryptedUrl; } else { - return MatrixClientPeg.get().mxcUrlToHttp(content.url, 800, 600); + const scaledWidth = Math.min(800, content.info.w); + return MatrixClientPeg.get().mxcUrlToHttp(content.url, scaledWidth, Math.floor(content.info.h * (scaledWidth / content.info.w))); } }, From 6d3dcf31a5746440480ba0296aeadd5e96e8f498 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Thu, 16 Feb 2017 10:53:53 +0000 Subject: [PATCH 2/4] Split long line --- src/components/views/messages/MImageBody.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index 146a2a8d188..618de0843f4 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -107,7 +107,11 @@ module.exports = React.createClass({ return this.state.decryptedUrl; } else { const scaledWidth = Math.min(800, content.info.w); - return MatrixClientPeg.get().mxcUrlToHttp(content.url, scaledWidth, Math.floor(content.info.h * (scaledWidth / content.info.w))); + return MatrixClientPeg.get().mxcUrlToHttp( + content.url, + scaledWidth, + Math.floor(content.info.h * (scaledWidth / content.info.w)), + ); } }, From ff1358cfe5355c7f8c4c108f710e196531e91b16 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Thu, 16 Feb 2017 10:57:11 +0000 Subject: [PATCH 3/4] Rename variable --- src/components/views/messages/MImageBody.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index 618de0843f4..4db8c8621a4 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -106,11 +106,11 @@ module.exports = React.createClass({ } return this.state.decryptedUrl; } else { - const scaledWidth = Math.min(800, content.info.w); + const cappedWidth = Math.min(800, content.info.w); return MatrixClientPeg.get().mxcUrlToHttp( content.url, - scaledWidth, - Math.floor(content.info.h * (scaledWidth / content.info.w)), + cappedWidth, + Math.floor(content.info.h * (cappedWidth / content.info.w)), ); } }, From d7e807bd432980fff9ed65546ece190fed94cb08 Mon Sep 17 00:00:00 2001 From: Luke Barnard Date: Thu, 16 Feb 2017 11:05:02 +0000 Subject: [PATCH 4/4] If !content.info, default to previous behaviour --- src/components/views/messages/MImageBody.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/components/views/messages/MImageBody.js b/src/components/views/messages/MImageBody.js index 4db8c8621a4..aadd3294632 100644 --- a/src/components/views/messages/MImageBody.js +++ b/src/components/views/messages/MImageBody.js @@ -106,12 +106,16 @@ module.exports = React.createClass({ } return this.state.decryptedUrl; } else { - const cappedWidth = Math.min(800, content.info.w); - return MatrixClientPeg.get().mxcUrlToHttp( - content.url, - cappedWidth, - Math.floor(content.info.h * (cappedWidth / content.info.w)), - ); + if (content.info) { + const cappedWidth = Math.min(800, content.info.w); + return MatrixClientPeg.get().mxcUrlToHttp( + content.url, + cappedWidth, + Math.floor(content.info.h * (cappedWidth / content.info.w)), + ); + } else { + return MatrixClientPeg.get().mxcUrlToHttp(content.url, 800, 600); + } } },