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

Tidy Quote class, removing comments etc

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2017-12-10 12:54:19 +00:00
parent 0f85391587
commit b6182f7e6c
No known key found for this signature in database
GPG key ID: 3F879DA5AD802A5E
1 changed files with 6 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/components/views/elements/Quote.js
View file

@ -15,14 +15,8 @@ limitations under the License.
*/ */
import React from 'react'; import React from 'react';
import sdk from '../../../index'; import sdk from '../../../index';
import dis from '../../../dispatcher';
import classNames from 'classnames';
import { Room, RoomMember } from 'matrix-js-sdk';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import MatrixClientPeg from '../../../MatrixClientPeg'; import MatrixClientPeg from '../../../MatrixClientPeg';
import { getDisplayAliasForRoom } from '../../../Rooms';
import {makeUserPermalink} from "../../../matrix-to";
import DateUtils from "../../../DateUtils";
// For URLs of matrix.to links in the timeline which have been reformatted by // For URLs of matrix.to links in the timeline which have been reformatted by
// HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`) // HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`)
@ -87,14 +81,9 @@ const Quote = React.createClass({
}, },
componentWillMount() { componentWillMount() {
this._unmounted = false;
this.componentWillReceiveProps(this.props); this.componentWillReceiveProps(this.props);
}, },
componentWillUnmount() {
this._unmounted = true;
},
async getEvent(room, eventId) { async getEvent(room, eventId) {
let event = room.findEventById(eventId); let event = room.findEventById(eventId);
if (event) { if (event) {
@ -111,27 +100,16 @@ const Quote = React.createClass({
const ev = this.state.event; const ev = this.state.event;
if (ev) { if (ev) {
const EventTile = sdk.getComponent('views.rooms.EventTile'); const EventTile = sdk.getComponent('views.rooms.EventTile');
// const EmojiText = sdk.getComponent('views.elements.EmojiText');
// const Pill = sdk.getComponent('views.elements.Pill');
// const senderUrl = makeUserPermalink(ev.getSender());
// const EventTileType = sdk.getComponent(EventTile.getHandlerTile(ev));
/*return <a href={this.props.url} >*/
return <blockquote> return <blockquote>
{/*<span style={{borderBottom: '2px red'}}>*/}
{/*<Pill room={this.state.room} url={senderUrl} shouldShowPillAvatar={this.props.shouldShowPillAvatar} />*/}
{/*&nbsp;<a href={this.props.url}><EmojiText>🔗</EmojiText> { DateUtils.formatTime(new Date(ev.getTs())) }</a>*/}
{/*</span>*/}
<EventTile mxEvent={ev} tileShape="quote" /> <EventTile mxEvent={ev} tileShape="quote" />
{/*<EventTileType mxEvent={ev} />*/}
</blockquote>; </blockquote>;
/*</a>;*/
} else {
// Deliberately render nothing if the URL isn't recognised
return <div>
<a href={this.props.url}>Quote</a>
<br />
</div>;
} }
// Deliberately render nothing if the URL isn't recognised
return <div>
<a href={this.props.url}>Quote</a>
<br />
</div>;
}, },
}); });