matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-07-28 15:22:05 +03:00
Code Activity

Merge branch 'develop' into travis/granular-settings

Browse Source
This commit is contained in:
Travis Ralston
2017-11-13 12:18:41 -07:00
parent 030633fa90 4b206a0117
commit c5c346f0b7
28 changed files with 2124 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,7 +224,7 @@ module.exports = React.createClass({
if (roomNotifTextNodes.length > 0) {
const pushProcessor = new PushProcessor(MatrixClientPeg.get());
const atRoomRule = pushProcessor.getPushRuleById(".m.rule.roomnotif");
if (pushProcessor.ruleMatchesEvent(atRoomRule, this.props.mxEvent)) {
if (atRoomRule && pushProcessor.ruleMatchesEvent(atRoomRule, this.props.mxEvent)) {
// Now replace all those nodes with Pills
for (const roomNotifTextNode of roomNotifTextNodes) {
const pillContainer = document.createElement('span');