mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Don't display anything if TextForEvent doesn't give us any text. Fixes #253 (catapillar of doom).

Browse source
This commit is contained in:
David Baker 2015-11-02 14:14:47 +00:00
parent 3b82884947
commit e869814f2d
2 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/skins/vector/views/molecules/EventTile.js
View file

@ -24,6 +24,8 @@ var sdk = require('matrix-react-sdk')
var EventTileController = require('matrix-react-sdk/lib/controllers/molecules/EventTile')
var ContextualMenu = require('../../../../ContextualMenu');
var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
var eventTileTypes = {
'm.room.message': 'molecules.MessageTile',
'm.room.member' : 'molecules.EventAsTextTile',
@ -39,8 +41,13 @@ module.exports = React.createClass({
mixins: [EventTileController],
statics: {
supportsEventType: function(et) {
return eventTileTypes[et] !== undefined;
haveTileForEvent: function(e) {
if (eventTileTypes[e.getType()] == undefined) return false;
if (eventTileTypes[e.getType()] == 'molecules.EventAsTextTile') {
return TextForEvent.textForEvent(e) !== '';
} else {
return true;
}
}
},