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

s/Reply/ReplyThread/

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2018-02-20 15:40:19 +00:00
parent 7048d85246
commit 90f9badbf3
No known key found for this signature in database
GPG key ID: 3F879DA5AD802A5E
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/RoomView.js
View file

@ -45,7 +45,7 @@ import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard';
import RoomViewStore from '../../stores/RoomViewStore'; import RoomViewStore from '../../stores/RoomViewStore';
import RoomScrollStateStore from '../../stores/RoomScrollStateStore'; import RoomScrollStateStore from '../../stores/RoomScrollStateStore';
import SettingsStore from "../../settings/SettingsStore"; import SettingsStore from "../../settings/SettingsStore";
import Reply from "../views/elements/Reply"; import Reply from "../views/elements/ReplyThread";
const DEBUG = false; const DEBUG = false;
let debuglog = function() {}; let debuglog = function() {};

8
src/components/views/elements/Reply.js → src/components/views/elements/ReplyThread.js
View file

@ -159,7 +159,7 @@ export default class Reply extends React.Component {
let header = null; let header = null;
if (this.state.err) { if (this.state.err) {
header = <blockquote className="mx_Reply mx_Reply_error"> header = <blockquote className="mx_ReplyThread mx_ReplyThread_error">
{ {
_t('Unable to load event that was replied to, ' + _t('Unable to load event that was replied to, ' +
'it either does not exist or you do not have permission to view it.') 'it either does not exist or you do not have permission to view it.')
@ -169,10 +169,10 @@ export default class Reply extends React.Component {
const ev = this.state.loadedEv; const ev = this.state.loadedEv;
const Pill = sdk.getComponent('elements.Pill'); const Pill = sdk.getComponent('elements.Pill');
const room = MatrixClientPeg.get().getRoom(ev.getRoomId()); const room = MatrixClientPeg.get().getRoom(ev.getRoomId());
header = <blockquote className="mx_Reply"> header = <blockquote className="mx_ReplyThread">
{ {
_t('<a>In reply to</a> <pill>', {}, { _t('<a>In reply to</a> <pill>', {}, {
'a': (sub) => <a onClick={this.onQuoteClick} className="mx_Reply_show">{ sub }</a>, 'a': (sub) => <a onClick={this.onQuoteClick} className="mx_ReplyThread_show">{ sub }</a>,
'pill': <Pill type={Pill.TYPE_USER_MENTION} room={room} 'pill': <Pill type={Pill.TYPE_USER_MENTION} room={room}
url={makeUserPermalink(ev.getSender())} shouldShowPillAvatar={true} />, url={makeUserPermalink(ev.getSender())} shouldShowPillAvatar={true} />,
}) })
@ -192,7 +192,7 @@ export default class Reply extends React.Component {
dateSep = <a href={this.props.url}><DateSeparator ts={ev.getTs()} /></a>; dateSep = <a href={this.props.url}><DateSeparator ts={ev.getTs()} /></a>;
} }
return <blockquote className="mx_Reply" key={ev.getId()}> return <blockquote className="mx_ReplyThread" key={ev.getId()}>
{ dateSep } { dateSep }
<EventTile mxEvent={ev} <EventTile mxEvent={ev}
tileShape="reply" tileShape="reply"

2
src/components/views/rooms/EventTile.js
View file

@ -18,7 +18,7 @@ limitations under the License.
'use strict'; 'use strict';
import Reply from "../elements/Reply"; import Reply from "../elements/ReplyThread";
const React = require('react'); const React = require('react');
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';

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

@ -54,7 +54,7 @@ import SettingsStore, {SettingLevel} from "../../../settings/SettingsStore";
import {makeUserPermalink} from "../../../matrix-to"; import {makeUserPermalink} from "../../../matrix-to";
import ReplyPreview from "./ReplyPreview"; import ReplyPreview from "./ReplyPreview";
import RoomViewStore from '../../../stores/RoomViewStore'; import RoomViewStore from '../../../stores/RoomViewStore';
import Reply from "../elements/Reply"; import Reply from "../elements/ReplyThread";
import {ContentHelpers} from 'matrix-js-sdk'; import {ContentHelpers} from 'matrix-js-sdk';
const EMOJI_SHORTNAMES = Object.keys(emojioneList); const EMOJI_SHORTNAMES = Object.keys(emojioneList);