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

rename all instances of permalinkCreator

Browse source
This commit is contained in:
Bruno Windels 2019-02-22 12:22:36 +01:00
parent be3d12721c
commit f7ea9cfeb2
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -525,7 +525,7 @@ module.exports = React.createClass({
eventSendStatus={mxEv.status} eventSendStatus={mxEv.status}
tileShape={this.props.tileShape} tileShape={this.props.tileShape}
isTwelveHour={this.props.isTwelveHour} isTwelveHour={this.props.isTwelveHour}
permalinkCreator={this.props.permaLinkCreator} permalinkCreator={this.props.permalinkCreator}
last={last} isSelectedEvent={highlight} /> last={last} isSelectedEvent={highlight} />
</li>, </li>,
); );

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

@ -443,8 +443,8 @@ module.exports = React.createClass({
} }
// stop tracking room changes to format permalinks // stop tracking room changes to format permalinks
if (this.state.permaLinkCreator) { if (this.state.permalinkCreator) {
this.state.permaLinkCreator.stop(); this.state.permalinkCreator.stop();
} }
if (this.refs.roomView) { if (this.refs.roomView) {
@ -658,10 +658,10 @@ module.exports = React.createClass({
this._loadMembersIfJoined(room); this._loadMembersIfJoined(room);
this._calculateRecommendedVersion(room); this._calculateRecommendedVersion(room);
this._updateE2EStatus(room); this._updateE2EStatus(room);
if (!this.state.permaLinkCreator) { if (!this.state.permalinkCreator) {
const permalinkCreator = new RoomPermalinkCreator(room); const permalinkCreator = new RoomPermalinkCreator(room);
permalinkCreator.start(); permalinkCreator.start();
this.setState({permaLinkCreator}); this.setState({permalinkCreator});
} }
}, },
@ -1230,7 +1230,7 @@ module.exports = React.createClass({
searchResult={result} searchResult={result}
searchHighlights={this.state.searchHighlights} searchHighlights={this.state.searchHighlights}
resultLink={resultLink} resultLink={resultLink}
permalinkCreator={this.state.permaLinkCreator} permalinkCreator={this.state.permalinkCreator}
onWidgetLoad={onWidgetLoad} />); onWidgetLoad={onWidgetLoad} />);
} }
return ret; return ret;
@ -1838,7 +1838,7 @@ module.exports = React.createClass({
showUrlPreview = {this.state.showUrlPreview} showUrlPreview = {this.state.showUrlPreview}
className="mx_RoomView_messagePanel" className="mx_RoomView_messagePanel"
membersLoaded={this.state.membersLoaded} membersLoaded={this.state.membersLoaded}
permalinkCreator={this.state.permaLinkCreator} permalinkCreator={this.state.permalinkCreator}
/>); />);
let topUnreadMessagesBar = null; let topUnreadMessagesBar = null;

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

@ -1202,7 +1202,7 @@ var TimelinePanel = React.createClass({
return ( return (
<MessagePanel ref="messagePanel" <MessagePanel ref="messagePanel"
room={this.props.timelineSet.room} room={this.props.timelineSet.room}
permalinkCreator={this.props.permaLinkCreator} permalinkCreator={this.props.permalinkCreator}
hidden={this.props.hidden} hidden={this.props.hidden}
backPaginating={this.state.backPaginating} backPaginating={this.state.backPaginating}
forwardPaginating={forwardPaginating} forwardPaginating={forwardPaginating}

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

@ -544,8 +544,8 @@ module.exports = withMatrixClient(React.createClass({
}); });
let permalink = "#"; let permalink = "#";
if (this.props.permaLinkCreator) { if (this.props.permalinkCreator) {
permalink = this.props.permaLinkCreator.forEvent(this.props.mxEvent.getId()); permalink = this.props.permalinkCreator.forEvent(this.props.mxEvent.getId());
} }
const readAvatars = this.getReadAvatars(); const readAvatars = this.getReadAvatars();

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

@ -56,7 +56,7 @@ module.exports = React.createClass({
} }
if (EventTile.haveTileForEvent(ev)) { if (EventTile.haveTileForEvent(ev)) {
ret.push(<EventTile key={eventId+"+"+j} mxEvent={ev} contextual={contextual} highlights={highlights} ret.push(<EventTile key={eventId+"+"+j} mxEvent={ev} contextual={contextual} highlights={highlights}
permalinkCreator={this.props.permaLinkCreator} permalinkCreator={this.props.permalinkCreator}
highlightLink={this.props.resultLink} highlightLink={this.props.resultLink}
onWidgetLoad={this.props.onWidgetLoad} />); onWidgetLoad={this.props.onWidgetLoad} />);
} }