OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

rename two methods 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2018-04-27 11:47:18 +01:00
parent 3050553fc2
commit 68dd57f56e
No known key found for this signature in database
GPG Key ID: 3F879DA5AD802A5E
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/elements/ReplyThread.js
View File

@ -232,7 +232,7 @@ export default class ReplyThread extends React.Component {
return {body, html}; return {body, html};
} }
static getReplyEvContent(ev) { static makeReplyMixIn(ev) {
if (!ev) return {}; if (!ev) return {};
return { return {
'm.relates_to': { 'm.relates_to': {
@ -243,7 +243,7 @@ export default class ReplyThread extends React.Component {
}; };
} }
static getThread(parentEv, onWidgetLoad, ref) { static makeThread(parentEv, onWidgetLoad, ref) {
if (!SettingsStore.isFeatureEnabled("feature_rich_quoting") || !ReplyThread.getParentEventId(parentEv)) { if (!SettingsStore.isFeatureEnabled("feature_rich_quoting") || !ReplyThread.getParentEventId(parentEv)) {
return <div />; return <div />;
} }

4
src/components/views/rooms/EventTile.js
View File

@ -666,7 +666,7 @@ module.exports = withMatrixClient(React.createClass({
{ this._renderE2EPadlock() } { this._renderE2EPadlock() }
{ {
this.props.tileShape === 'reply_preview' this.props.tileShape === 'reply_preview'
&& ReplyThread.getThread(this.props.mxEvent, this.props.onWidgetLoad, 'replyThread') && ReplyThread.makeThread(this.props.mxEvent, this.props.onWidgetLoad, 'replyThread')
} }
<EventTileType ref="tile" <EventTileType ref="tile"
mxEvent={this.props.mxEvent} mxEvent={this.props.mxEvent}
@ -691,7 +691,7 @@ module.exports = withMatrixClient(React.createClass({
{ timestamp } { timestamp }
</a> </a>
{ this._renderE2EPadlock() } { this._renderE2EPadlock() }
{ ReplyThread.getThread(this.props.mxEvent, this.props.onWidgetLoad, 'replyThread') } { ReplyThread.makeThread(this.props.mxEvent, this.props.onWidgetLoad, 'replyThread') }
<EventTileType ref="tile" <EventTileType ref="tile"
mxEvent={this.props.mxEvent} mxEvent={this.props.mxEvent}
highlights={this.props.highlights} highlights={this.props.highlights}

2
src/components/views/rooms/MessageComposerInput.js
View File

@ -856,7 +856,7 @@ export default class MessageComposerInput extends React.Component {
let content = contentHTML ? sendHtmlFn(contentText, contentHTML) : sendTextFn(contentText); let content = contentHTML ? sendHtmlFn(contentText, contentHTML) : sendTextFn(contentText);
if (replyingToEv) { if (replyingToEv) {
const replyContent = ReplyThread.getReplyEvContent(replyingToEv); const replyContent = ReplyThread.makeReplyMixIn(replyingToEv);
content = Object.assign(replyContent, content); content = Object.assign(replyContent, content);
// Part of Replies fallback support - prepend the text we're sending with the text we're replying to // Part of Replies fallback support - prepend the text we're sending with the text we're replying to