Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 21:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Pass the decryptedUrl to the MFileBody so that it doesn't need to decrypt it itself.

Browse Source 
Conflicts:
	src/components/views/messages/MImageBody.js
This commit is contained in:
Mark Haines 2016-11-04 18:20:20 +00:00
parent 736ab743ee
commit de384480c6
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/views/messages/MAudioBody.js
View File

@ -81,7 +81,7 @@ export default class MAudioBody extends React.Component {
return (
<span className="mx_MAudioBody">
<audio src={contentUrl} controls />
<MFileBody {...this.props} />
<MFileBody {...this.props} decryptedUrl={this.state.decryptedUrl} />
</span>
);
}

2
src/components/views/messages/MFileBody.js
View File

@ -28,7 +28,7 @@ module.exports = React.createClass({
getInitialState: function() {
return {
decryptedUrl: null,
decryptedUrl: (this.props.decryptedUrl ? this.props.decryptedUrl : null),
};
},

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

@ -18,7 +18,9 @@ limitations under the License.
var React = require('react');
var filesize = require('filesize');
var MFileBody = require('./MFileBody');
import MFileBody from './MFileBody';
var MatrixClientPeg = require('../../../MatrixClientPeg');
var ImageUtils = require('../../../ImageUtils');
var Modal = require('../../../Modal');
@ -182,7 +184,7 @@ module.exports = React.createClass({
onMouseEnter={this.onImageEnter}
onMouseLeave={this.onImageLeave} />
</a>
<MFileBody {...this.props} />
<MFileBody {...this.props} decryptedUrl={this.state.decryptedUrl} />
</span>
);
} else if (content.body) {

2
src/components/views/messages/MVideoBody.js
View File

@ -147,7 +147,7 @@ module.exports = React.createClass({
controls preload={preload} autoPlay={false}
height={height} width={width} poster={poster}>
</video>
<MFileBody {...this.props} />
<MFileBody {...this.props} decryptedUrl={this.state.decryptedUrl} />
</span>
);
},