e2m/dispatch
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use a fork of autolinker with react support to get rid off dangerouslySetInnerHTML

Browse source
This commit is contained in:
Ken-Håvard Lieng 2016-02-17 01:49:27 +01:00
parent 072daa64f2
commit 47ebd9c84c
6 changed files with 44 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/src/js/components/ChatTitle.js
View file

@ -1,8 +1,8 @@
import React, { Component } from 'react';
import { List } from 'immutable';
import Autolinker from 'autolinker';
import pure from 'pure-render-decorator';
import Navicon from '../components/Navicon';
import { linkify } from '../util';
@pure
export default class ChatTitle extends Component {
@ -20,7 +20,8 @@ export default class ChatTitle extends Component {
render() {
const { title, tab, channel, toggleSearch, toggleUserList } = this.props;
const topic = Autolinker.link(channel.get('topic') || '', { stripPrefix: false });
const _topic = channel.get('topic');
const topic = _topic ? linkify(_topic) : null;
let leaveTitle;
if (tab.channel) {
@ -37,7 +38,7 @@ export default class ChatTitle extends Component {
<Navicon />
<span className="chat-title">{title}</span>
<div className="chat-topic-wrap">
<span className="chat-topic" dangerouslySetInnerHTML={{ __html: topic }}></span>
<span className="chat-topic">{topic}</span>
</div>
<i className="icon-search" title="Search" onClick={toggleSearch} />
<i

6
client/src/js/components/Message.js
View file

@ -1,7 +1,6 @@
import React, { Component } from 'react';
import Autolinker from 'autolinker';
import pure from 'pure-render-decorator';
import { timestamp } from '../util';
import { timestamp, linkify } from '../util';
@pure
export default class Message extends Component {
@ -14,7 +13,6 @@ export default class Message extends Component {
render() {
const { message } = this.props;
const content = Autolinker.link(message.message, { stripPrefix: false });
const classes = ['message'];
let sender = null;
@ -42,7 +40,7 @@ export default class Message extends Component {
<p className={classes.join(' ')} style={style}>
<span className="message-time">{timestamp(message.time)}</span>
{sender}
<span dangerouslySetInnerHTML={{ __html: ` ${content}` }}></span>
<span>{' '}{linkify(message.message)}</span>
</p>
);
}