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

Merge pull request #2532 from boeserwolf/boeserwolf/get-set-topic

Browse source 
Extend slash command '/topic' to display the room topic
This commit is contained in:
David Baker 2019-02-07 13:45:59 +00:00 • committed by GitHub
commit b7fd1336de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 141 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/rooms/RoomHeader.js
View file

@ -25,9 +25,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
import Modal from "../../../Modal";
import RateLimitedFunc from '../../../ratelimitedfunc';
import * as linkify from 'linkifyjs';
import linkifyElement from 'linkifyjs/element';
import linkifyMatrix from '../../../linkify-matrix';
import { linkifyElement } from '../../../HtmlUtils';
import AccessibleButton from '../elements/AccessibleButton';
import ManageIntegsButton from '../elements/ManageIntegsButton';
import {CancelButton} from './SimpleRoomHeader';
@ -35,8 +33,6 @@ import SettingsStore from "../../../settings/SettingsStore";
import RoomHeaderButtons from '../right_panel/RoomHeaderButtons';
import E2EIcon from './E2EIcon';
linkifyMatrix(linkify);
module.exports = React.createClass({
displayName: 'RoomHeader',
@ -76,7 +72,7 @@ module.exports = React.createClass({
componentDidUpdate: function() {
if (this.refs.topic) {
linkifyElement(this.refs.topic, linkifyMatrix.options);
linkifyElement(this.refs.topic);
}
},