PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Move scalar auth stuff to ScalarAuthClient from RoomSettings

Browse source
This commit is contained in:
Kegan Dougal 2016-09-02 16:03:24 +01:00
parent d3bc2b7df7
commit 6ec7e5df28
3 changed files with 59 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/messages/TextualBody.js
View file

@ -176,15 +176,23 @@ module.exports = React.createClass({
}
},
onStarterLinkClick: function() {
},
render: function() {
const EmojiText = sdk.getComponent('elements.EmojiText');
var mxEvent = this.props.mxEvent;
var content = mxEvent.getContent();
var body = HtmlUtils.bodyToHtml(content, this.props.highlights, {});
if (this.props.highlightLink) {
body = <a href={ this.props.highlightLink }>{ body }</a>;
}
else if (content.data && typeof content.data["org.matrix.neb.starter_link"] === "string") {
console.log("Set starter link");
body = <a href={ content.data["org.matrix.neb.starter_link"] }>{ body }</a>;
}
var widgets;
if (this.state.links.length && !this.state.widgetHidden && this.props.showUrlPreview) {