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

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
Download patch file Download diff file Expand all files Collapse all files

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) {