imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make everything use MFileBody for downloads, ensure that encrypted attachments are actually downloaded

Browse source 
Conflicts:
	src/components/views/messages/MImageBody.js
This commit is contained in:
Mark Haines 2016-11-04 18:09:12 +00:00
parent ee1768f644
commit 736ab743ee
3 changed files with 37 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/components/views/messages/MImageBody.js
View file

@ -18,6 +18,7 @@ limitations under the License.
var React = require('react');
var filesize = require('filesize');
var MFileBody = require('./MFileBody');
var MatrixClientPeg = require('../../../MatrixClientPeg');
var ImageUtils = require('../../../ImageUtils');
var Modal = require('../../../Modal');
@ -172,30 +173,6 @@ module.exports = React.createClass({
var contentUrl = this._getContentUrl();
var thumbUrl = this._getThumbUrl();
var download;
if (this.props.tileShape === "file_grid") {
download = (
<div className="mx_MImageBody_download">
<a className="mx_MImageBody_downloadLink" href={contentUrl} target="_blank" rel="noopener">
{content.body}
</a>
<div className="mx_MImageBody_size">
{ content.info && content.info.size ? filesize(content.info.size) : "" }
</div>
</div>
);
}
else {
download = (
<div className="mx_MImageBody_download">
<a href={contentUrl} target="_blank" rel="noopener">
<TintableSvg src="img/download.svg" width="12" height="14"/>
Download {content.body} ({ content.info && content.info.size ? filesize(content.info.size) : "Unknown size" })
</a>
</div>
);
}
if (thumbUrl) {
return (
<span className="mx_MImageBody" ref="body">
@ -205,7 +182,7 @@ module.exports = React.createClass({
onMouseEnter={this.onImageEnter}
onMouseLeave={this.onImageLeave} />
</a>
{ download }
<MFileBody {...this.props} />
</span>
);
} else if (content.body) {