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

Merge branch 'develop' into travis/react-warnings/3-componentCannotDidMount

Browse source
This commit is contained in:
Travis Ralston 2020-04-01 11:14:19 -06:00 • committed by GitHub
commit 07030a9466
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
102 changed files with 640 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/async-components/views/dialogs/EncryptedEventDialog.js
View file

@ -37,7 +37,7 @@ export default createReactClass({
return { device: null };
},
componentWillMount: function() {
componentDidMount: function() {
this._unmounted = false;
const client = MatrixClientPeg.get();
@ -79,7 +79,7 @@ export default createReactClass({
},
onDeviceVerificationChanged: function(userId, device) {
if (userId == this.props.event.getSender()) {
if (userId === this.props.event.getSender()) {
this.refreshDevice().then((dev) => {
this.setState({ device: dev });
});

12
src/async-components/views/dialogs/eventindex/ManageEventIndexDialog.js
View file

@ -30,7 +30,7 @@ import EventIndexPeg from "../../../../indexing/EventIndexPeg";
export default class ManageEventIndexDialog extends React.Component {
static propTypes = {
onFinished: PropTypes.func.isRequired,
}
};
constructor(props) {
super(props);
@ -82,7 +82,7 @@ export default class ManageEventIndexDialog extends React.Component {
}
}
async componentWillMount(): void {
async componentDidMount(): void {
let eventIndexSize = 0;
let crawlingRoomsCount = 0;
let roomCount = 0;
@ -126,16 +126,12 @@ export default class ManageEventIndexDialog extends React.Component {
import("./DisableEventIndexDialog"),
null, null, /* priority = */ false, /* static = */ true,
);
}
_onDone = () => {
this.props.onFinished(true);
}
};
_onCrawlerSleepTimeChange = (e) => {
this.setState({crawlerSleepTime: e.target.value});
SettingsStore.setValue("crawlerSleepTime", null, SettingLevel.DEVICE, e.target.value);
}
};
render() {
let crawlerState;