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

Merge pull request #4463 from matrix-org/t3chguy/fix_autocomplete 

Fix post-ts autocomplete, it is not null
pull/21833/head
Michael Telatynski 2020-04-22 13:29:17 +01:00 committed by GitHub
parent dd1f1b3092 fc828378fa
commit f2a91e7039
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/autocomplete/AutocompleteProvider.tsx
View File

@ -64,7 +64,7 @@ export default class AutocompleteProvider {
commandRegex = this.forcedCommandRegex || /\S+/g; commandRegex = this.forcedCommandRegex || /\S+/g;
} }
if (commandRegex === null) { if (!commandRegex) {
return null; return null;
} }

4
src/autocomplete/UserProvider.tsx
View File

@ -102,7 +102,7 @@ export default class UserProvider extends AutocompleteProvider {
const MemberAvatar = sdk.getComponent('views.avatars.MemberAvatar'); const MemberAvatar = sdk.getComponent('views.avatars.MemberAvatar');
// lazy-load user list into matcher // lazy-load user list into matcher
if (this.users === null) this._makeUsers(); if (!this.users) this._makeUsers();
let completions = []; let completions = [];
const {command, range} = this.getCurrentCommand(rawQuery, selection, force); const {command, range} = this.getCurrentCommand(rawQuery, selection, force);
@ -158,7 +158,7 @@ export default class UserProvider extends AutocompleteProvider {
} }
onUserSpoke(user: RoomMember) { onUserSpoke(user: RoomMember) {
if (this.users === null) return; if (!this.users) return;
if (!user) return; if (!user) return;
if (user.userId === MatrixClientPeg.get().credentials.userId) return; if (user.userId === MatrixClientPeg.get().credentials.userId) return;